Mercurial > hg > nginx
annotate src/http/modules/ngx_http_mp4_module.c @ 4589:533aa09a783b stable-1.0
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 12 Apr 2012 12:55:43 +0000 |
parents | 4919fb357a5d |
children |
rev | line source |
---|---|
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
4450
4919fb357a5d
Merge of r4406, r4413: copyrights updated.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4441
diff
changeset
|
4 * Copyright (C) Nginx, Inc. |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
6 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 #include <ngx_config.h> |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_core.h> |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 #include <ngx_http.h> |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
12 #define NGX_HTTP_MP4_TRAK_ATOM 0 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
13 #define NGX_HTTP_MP4_TKHD_ATOM 1 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
14 #define NGX_HTTP_MP4_MDIA_ATOM 2 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
15 #define NGX_HTTP_MP4_MDHD_ATOM 3 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
16 #define NGX_HTTP_MP4_HDLR_ATOM 4 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
17 #define NGX_HTTP_MP4_MINF_ATOM 5 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
18 #define NGX_HTTP_MP4_VMHD_ATOM 6 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
19 #define NGX_HTTP_MP4_SMHD_ATOM 7 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
20 #define NGX_HTTP_MP4_DINF_ATOM 8 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
21 #define NGX_HTTP_MP4_STBL_ATOM 9 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
22 #define NGX_HTTP_MP4_STSD_ATOM 10 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
23 #define NGX_HTTP_MP4_STTS_ATOM 11 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
24 #define NGX_HTTP_MP4_STTS_DATA 12 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
25 #define NGX_HTTP_MP4_STSS_ATOM 13 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
26 #define NGX_HTTP_MP4_STSS_DATA 14 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
27 #define NGX_HTTP_MP4_CTTS_ATOM 15 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
28 #define NGX_HTTP_MP4_CTTS_DATA 16 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
29 #define NGX_HTTP_MP4_STSC_ATOM 17 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
30 #define NGX_HTTP_MP4_STSC_CHUNK 18 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
31 #define NGX_HTTP_MP4_STSC_DATA 19 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
32 #define NGX_HTTP_MP4_STSZ_ATOM 20 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
33 #define NGX_HTTP_MP4_STSZ_DATA 21 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
34 #define NGX_HTTP_MP4_STCO_ATOM 22 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
35 #define NGX_HTTP_MP4_STCO_DATA 23 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
36 #define NGX_HTTP_MP4_CO64_ATOM 24 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
37 #define NGX_HTTP_MP4_CO64_DATA 25 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
38 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
39 #define NGX_HTTP_MP4_LAST_ATOM NGX_HTTP_MP4_CO64_DATA |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
40 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
41 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
42 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
43 size_t buffer_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
44 size_t max_buffer_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
45 } ngx_http_mp4_conf_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
46 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
47 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
48 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
49 u_char chunk[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
50 u_char samples[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
51 u_char id[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
52 } ngx_mp4_stsc_entry_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
53 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
54 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
55 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
56 uint32_t timescale; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
57 uint32_t time_to_sample_entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
58 uint32_t sample_to_chunk_entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
59 uint32_t sync_samples_entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
60 uint32_t composition_offset_entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
61 uint32_t sample_sizes_entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
62 uint32_t chunks; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
63 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
64 ngx_uint_t start_sample; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
65 ngx_uint_t start_chunk; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
66 ngx_uint_t chunk_samples; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
67 uint64_t chunk_samples_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
68 off_t start_offset; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
69 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
70 size_t tkhd_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
71 size_t mdhd_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
72 size_t hdlr_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
73 size_t vmhd_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
74 size_t smhd_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
75 size_t dinf_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
76 size_t size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
77 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
78 ngx_chain_t out[NGX_HTTP_MP4_LAST_ATOM + 1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
79 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
80 ngx_buf_t trak_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
81 ngx_buf_t tkhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
82 ngx_buf_t mdia_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
83 ngx_buf_t mdhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
84 ngx_buf_t hdlr_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
85 ngx_buf_t minf_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
86 ngx_buf_t vmhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
87 ngx_buf_t smhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
88 ngx_buf_t dinf_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
89 ngx_buf_t stbl_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
90 ngx_buf_t stsd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
91 ngx_buf_t stts_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
92 ngx_buf_t stts_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
93 ngx_buf_t stss_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
94 ngx_buf_t stss_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
95 ngx_buf_t ctts_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
96 ngx_buf_t ctts_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
97 ngx_buf_t stsc_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
98 ngx_buf_t stsc_chunk_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
99 ngx_buf_t stsc_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
100 ngx_buf_t stsz_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
101 ngx_buf_t stsz_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
102 ngx_buf_t stco_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
103 ngx_buf_t stco_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
104 ngx_buf_t co64_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
105 ngx_buf_t co64_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
106 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
107 ngx_mp4_stsc_entry_t stsc_chunk_entry; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
108 } ngx_http_mp4_trak_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
109 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
110 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
111 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
112 ngx_file_t file; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
113 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
114 u_char *buffer; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
115 u_char *buffer_start; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
116 u_char *buffer_pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
117 u_char *buffer_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
118 size_t buffer_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
119 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
120 off_t offset; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
121 off_t end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
122 off_t content_length; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
123 ngx_uint_t start; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
124 uint32_t timescale; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
125 ngx_http_request_t *request; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
126 ngx_array_t trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
127 ngx_http_mp4_trak_t traks[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
128 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
129 size_t ftyp_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
130 size_t moov_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
131 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
132 ngx_chain_t *out; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
133 ngx_chain_t ftyp_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
134 ngx_chain_t moov_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
135 ngx_chain_t mvhd_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
136 ngx_chain_t mdat_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
137 ngx_chain_t mdat_data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
138 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
139 ngx_buf_t ftyp_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
140 ngx_buf_t moov_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
141 ngx_buf_t mvhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
142 ngx_buf_t mdat_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
143 ngx_buf_t mdat_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
144 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
145 u_char moov_atom_header[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
146 u_char mdat_atom_header[16]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
147 } ngx_http_mp4_file_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
148 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
149 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
150 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
151 char *name; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
152 ngx_int_t (*handler)(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
153 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
154 } ngx_http_mp4_atom_handler_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
155 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
156 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
157 #define ngx_mp4_atom_header(mp4) (mp4->buffer_pos - 8) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
158 #define ngx_mp4_atom_data(mp4) mp4->buffer_pos |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
159 #define ngx_mp4_atom_data_size(t) (uint64_t) (sizeof(t) - 8) |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
160 #define ngx_mp4_atom_next(mp4, n) mp4->buffer_pos += n; mp4->offset += n |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
161 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
162 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
163 #define ngx_mp4_set_atom_name(p, n1, n2, n3, n4) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
164 ((u_char *) (p))[4] = n1; \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
165 ((u_char *) (p))[5] = n2; \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
166 ((u_char *) (p))[6] = n3; \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
167 ((u_char *) (p))[7] = n4 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
168 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
169 #define ngx_mp4_get_32value(p) \ |
4441 | 170 ( ((uint32_t) ((u_char *) (p))[0] << 24) \ |
171 + ( ((u_char *) (p))[1] << 16) \ | |
172 + ( ((u_char *) (p))[2] << 8) \ | |
173 + ( ((u_char *) (p))[3]) ) | |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
174 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
175 #define ngx_mp4_set_32value(p, n) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
176 ((u_char *) (p))[0] = (u_char) ((n) >> 24); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
177 ((u_char *) (p))[1] = (u_char) ((n) >> 16); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
178 ((u_char *) (p))[2] = (u_char) ((n) >> 8); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
179 ((u_char *) (p))[3] = (u_char) (n) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
180 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
181 #define ngx_mp4_get_64value(p) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
182 ( ((uint64_t) ((u_char *) (p))[0] << 56) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
183 + ((uint64_t) ((u_char *) (p))[1] << 48) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
184 + ((uint64_t) ((u_char *) (p))[2] << 40) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
185 + ((uint64_t) ((u_char *) (p))[3] << 32) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
186 + ((uint64_t) ((u_char *) (p))[4] << 24) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
187 + ( ((u_char *) (p))[5] << 16) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
188 + ( ((u_char *) (p))[6] << 8) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
189 + ( ((u_char *) (p))[7]) ) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
190 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
191 #define ngx_mp4_set_64value(p, n) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
192 ((u_char *) (p))[0] = (u_char) ((uint64_t) (n) >> 56); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
193 ((u_char *) (p))[1] = (u_char) ((uint64_t) (n) >> 48); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
194 ((u_char *) (p))[2] = (u_char) ((uint64_t) (n) >> 40); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
195 ((u_char *) (p))[3] = (u_char) ((uint64_t) (n) >> 32); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
196 ((u_char *) (p))[4] = (u_char) ( (n) >> 24); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
197 ((u_char *) (p))[5] = (u_char) ( (n) >> 16); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
198 ((u_char *) (p))[6] = (u_char) ( (n) >> 8); \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
199 ((u_char *) (p))[7] = (u_char) (n) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
200 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
201 #define ngx_mp4_last_trak(mp4) \ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
202 &((ngx_http_mp4_trak_t *) mp4->trak.elts)[mp4->trak.nelts - 1] |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
203 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
204 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
205 static ngx_int_t ngx_http_mp4_process(ngx_http_mp4_file_t *mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
206 static ngx_int_t ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
207 ngx_http_mp4_atom_handler_t *atom, uint64_t atom_data_size); |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
208 static ngx_int_t ngx_http_mp4_read(ngx_http_mp4_file_t *mp4, size_t size); |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
209 static ngx_int_t ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
210 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
211 static ngx_int_t ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
212 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
213 static ngx_int_t ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
214 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
215 static size_t ngx_http_mp4_update_mdat_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
216 off_t start_offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
217 static ngx_int_t ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
218 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
219 static ngx_int_t ngx_http_mp4_read_trak_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
220 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
221 static void ngx_http_mp4_update_trak_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
222 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
223 static ngx_int_t ngx_http_mp4_read_cmov_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
224 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
225 static ngx_int_t ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
226 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
227 static ngx_int_t ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
228 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
229 static void ngx_http_mp4_update_mdia_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
230 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
231 static ngx_int_t ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
232 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
233 static ngx_int_t ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
234 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
235 static ngx_int_t ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
236 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
237 static void ngx_http_mp4_update_minf_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
238 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
239 static ngx_int_t ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
240 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
241 static ngx_int_t ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
242 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
243 static ngx_int_t ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
244 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
245 static ngx_int_t ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
246 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
247 static void ngx_http_mp4_update_stbl_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
248 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
249 static ngx_int_t ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
250 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
251 static ngx_int_t ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
252 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
253 static ngx_int_t ngx_http_mp4_update_stts_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
254 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
255 static ngx_int_t ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
256 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
257 static ngx_int_t ngx_http_mp4_update_stss_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
258 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
259 static ngx_int_t ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
260 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
261 static void ngx_http_mp4_update_ctts_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
262 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
263 static ngx_int_t ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
264 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
265 static ngx_int_t ngx_http_mp4_update_stsc_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
266 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
267 static ngx_int_t ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
268 uint64_t atom_data_size); |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
269 static ngx_int_t ngx_http_mp4_update_stsz_atom(ngx_http_mp4_file_t *mp4, |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
270 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
271 static ngx_int_t ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
272 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
273 static ngx_int_t ngx_http_mp4_update_stco_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
274 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
275 static void ngx_http_mp4_adjust_stco_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
276 ngx_http_mp4_trak_t *trak, int32_t adjustment); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
277 static ngx_int_t ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
278 uint64_t atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
279 static ngx_int_t ngx_http_mp4_update_co64_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
280 ngx_http_mp4_trak_t *trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
281 static void ngx_http_mp4_adjust_co64_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
282 ngx_http_mp4_trak_t *trak, off_t adjustment); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
283 static char *ngx_http_mp4(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
284 static void *ngx_http_mp4_create_conf(ngx_conf_t *cf); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
285 static char *ngx_http_mp4_merge_conf(ngx_conf_t *cf, void *parent, void *child); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
286 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
287 static ngx_command_t ngx_http_mp4_commands[] = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
288 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
289 { ngx_string("mp4"), |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
290 NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
291 ngx_http_mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
292 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
293 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
294 NULL }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
295 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
296 { ngx_string("mp4_buffer_size"), |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
297 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
298 ngx_conf_set_size_slot, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
299 NGX_HTTP_LOC_CONF_OFFSET, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
300 offsetof(ngx_http_mp4_conf_t, buffer_size), |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
301 NULL }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
302 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
303 { ngx_string("mp4_max_buffer_size"), |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
304 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
305 ngx_conf_set_size_slot, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
306 NGX_HTTP_LOC_CONF_OFFSET, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
307 offsetof(ngx_http_mp4_conf_t, max_buffer_size), |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
308 NULL }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
309 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
310 ngx_null_command |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
311 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
312 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
313 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
314 static ngx_http_module_t ngx_http_mp4_module_ctx = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
315 NULL, /* preconfiguration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
316 NULL, /* postconfiguration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
317 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
318 NULL, /* create main configuration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
319 NULL, /* init main configuration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
320 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
321 NULL, /* create server configuration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
322 NULL, /* merge server configuration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
323 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
324 ngx_http_mp4_create_conf, /* create location configuration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
325 ngx_http_mp4_merge_conf /* merge location configuration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
326 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
327 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
328 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
329 ngx_module_t ngx_http_mp4_module = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
330 NGX_MODULE_V1, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
331 &ngx_http_mp4_module_ctx, /* module context */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
332 ngx_http_mp4_commands, /* module directives */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
333 NGX_HTTP_MODULE, /* module type */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
334 NULL, /* init master */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
335 NULL, /* init module */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
336 NULL, /* init process */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
337 NULL, /* init thread */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
338 NULL, /* exit thread */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
339 NULL, /* exit process */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
340 NULL, /* exit master */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
341 NGX_MODULE_V1_PADDING |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
342 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
343 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
344 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
345 static ngx_http_mp4_atom_handler_t ngx_http_mp4_atoms[] = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
346 { "ftyp", ngx_http_mp4_read_ftyp_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
347 { "moov", ngx_http_mp4_read_moov_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
348 { "mdat", ngx_http_mp4_read_mdat_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
349 { NULL, NULL } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
350 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
351 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
352 static ngx_http_mp4_atom_handler_t ngx_http_mp4_moov_atoms[] = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
353 { "mvhd", ngx_http_mp4_read_mvhd_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
354 { "trak", ngx_http_mp4_read_trak_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
355 { "cmov", ngx_http_mp4_read_cmov_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
356 { NULL, NULL } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
357 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
358 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
359 static ngx_http_mp4_atom_handler_t ngx_http_mp4_trak_atoms[] = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
360 { "tkhd", ngx_http_mp4_read_tkhd_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
361 { "mdia", ngx_http_mp4_read_mdia_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
362 { NULL, NULL } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
363 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
364 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
365 static ngx_http_mp4_atom_handler_t ngx_http_mp4_mdia_atoms[] = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
366 { "mdhd", ngx_http_mp4_read_mdhd_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
367 { "hdlr", ngx_http_mp4_read_hdlr_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
368 { "minf", ngx_http_mp4_read_minf_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
369 { NULL, NULL } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
370 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
371 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
372 static ngx_http_mp4_atom_handler_t ngx_http_mp4_minf_atoms[] = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
373 { "vmhd", ngx_http_mp4_read_vmhd_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
374 { "smhd", ngx_http_mp4_read_smhd_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
375 { "dinf", ngx_http_mp4_read_dinf_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
376 { "stbl", ngx_http_mp4_read_stbl_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
377 { NULL, NULL } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
378 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
379 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
380 static ngx_http_mp4_atom_handler_t ngx_http_mp4_stbl_atoms[] = { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
381 { "stsd", ngx_http_mp4_read_stsd_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
382 { "stts", ngx_http_mp4_read_stts_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
383 { "stss", ngx_http_mp4_read_stss_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
384 { "ctts", ngx_http_mp4_read_ctts_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
385 { "stsc", ngx_http_mp4_read_stsc_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
386 { "stsz", ngx_http_mp4_read_stsz_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
387 { "stco", ngx_http_mp4_read_stco_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
388 { "co64", ngx_http_mp4_read_co64_atom }, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
389 { NULL, NULL } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
390 }; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
391 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
392 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
393 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
394 ngx_http_mp4_handler(ngx_http_request_t *r) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
395 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
396 u_char *last; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
397 size_t root; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
398 ngx_int_t rc, start; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
399 ngx_uint_t level; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
400 ngx_str_t path, value; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
401 ngx_log_t *log; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
402 ngx_buf_t *b; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
403 ngx_chain_t out; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
404 ngx_http_mp4_file_t *mp4; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
405 ngx_open_file_info_t of; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
406 ngx_http_core_loc_conf_t *clcf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
407 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
408 if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
409 return NGX_HTTP_NOT_ALLOWED; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
410 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
411 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
412 if (r->uri.data[r->uri.len - 1] == '/') { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
413 return NGX_DECLINED; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
414 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
415 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
416 rc = ngx_http_discard_request_body(r); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
417 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
418 if (rc != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
419 return rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
420 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
421 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
422 last = ngx_http_map_uri_to_path(r, &path, &root, 0); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
423 if (last == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
424 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
425 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
426 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
427 log = r->connection->log; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
428 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
429 path.len = last - path.data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
430 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
431 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
432 "http mp4 filename: \"%V\"", &path); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
433 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
434 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
435 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
436 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
437 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
438 of.read_ahead = clcf->read_ahead; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
439 of.directio = NGX_MAX_OFF_T_VALUE; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
440 of.valid = clcf->open_file_cache_valid; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
441 of.min_uses = clcf->open_file_cache_min_uses; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
442 of.errors = clcf->open_file_cache_errors; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
443 of.events = clcf->open_file_cache_events; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
444 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
445 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
446 != NGX_OK) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
447 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
448 switch (of.err) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
449 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
450 case 0: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
451 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
452 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
453 case NGX_ENOENT: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
454 case NGX_ENOTDIR: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
455 case NGX_ENAMETOOLONG: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
456 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
457 level = NGX_LOG_ERR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
458 rc = NGX_HTTP_NOT_FOUND; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
459 break; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
460 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
461 case NGX_EACCES: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
462 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
463 level = NGX_LOG_ERR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
464 rc = NGX_HTTP_FORBIDDEN; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
465 break; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
466 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
467 default: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
468 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
469 level = NGX_LOG_CRIT; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
470 rc = NGX_HTTP_INTERNAL_SERVER_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
471 break; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
472 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
473 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
474 if (rc != NGX_HTTP_NOT_FOUND || clcf->log_not_found) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
475 ngx_log_error(level, log, of.err, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
476 "%s \"%s\" failed", of.failed, path.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
477 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
478 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
479 return rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
480 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
481 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
482 if (!of.is_file) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
483 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
484 if (ngx_close_file(of.fd) == NGX_FILE_ERROR) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
485 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
486 ngx_close_file_n " \"%s\" failed", path.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
487 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
488 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
489 return NGX_DECLINED; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
490 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
491 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
492 r->root_tested = !r->error_page; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
493 r->allow_ranges = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
494 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
495 start = -1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
496 r->headers_out.content_length_n = of.size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
497 mp4 = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
498 b = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
499 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
500 if (r->args.len) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
501 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
502 if (ngx_http_arg(r, (u_char *) "start", 5, &value) == NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
503 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
504 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
505 * A Flash player may send start value with a lot of digits |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
506 * after dot so strtod() is used instead of atofp(). NaNs and |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
507 * infinities become negative numbers after (int) conversion. |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
508 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
509 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
510 ngx_set_errno(0); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
511 start = (int) (strtod((char *) value.data, NULL) * 1000); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
512 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
513 if (ngx_errno == 0 && start >= 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
514 r->allow_ranges = 0; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
515 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
516 mp4 = ngx_pcalloc(r->pool, sizeof(ngx_http_mp4_file_t)); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
517 if (mp4 == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
518 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
519 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
520 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
521 mp4->file.fd = of.fd; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
522 mp4->file.name = path; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
523 mp4->file.log = r->connection->log;; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
524 mp4->end = of.size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
525 mp4->start = (ngx_uint_t) start; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
526 mp4->request = r; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
527 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
528 switch (ngx_http_mp4_process(mp4)) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
529 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
530 case NGX_DECLINED: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
531 if (mp4->buffer) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
532 ngx_pfree(r->pool, mp4->buffer); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
533 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
534 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
535 ngx_pfree(r->pool, mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
536 mp4 = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
537 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
538 break; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
539 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
540 case NGX_OK: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
541 r->headers_out.content_length_n = mp4->content_length; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
542 break; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
543 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
544 default: /* NGX_ERROR */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
545 if (mp4->buffer) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
546 ngx_pfree(r->pool, mp4->buffer); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
547 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
548 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
549 ngx_pfree(r->pool, mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
550 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
551 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
552 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
553 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
554 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
555 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
556 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
557 log->action = "sending mp4 to client"; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
558 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
559 if (clcf->directio <= of.size) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
560 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
561 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
562 * DIRECTIO is set on transfer only |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
563 * to allow kernel to cache "moov" atom |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
564 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
565 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
566 if (ngx_directio_on(of.fd) == NGX_FILE_ERROR) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
567 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
568 ngx_directio_on_n " \"%s\" failed", path.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
569 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
570 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
571 of.is_directio = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
572 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
573 if (mp4) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
574 mp4->file.directio = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
575 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
576 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
577 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
578 r->headers_out.status = NGX_HTTP_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
579 r->headers_out.last_modified_time = of.mtime; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
580 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
581 if (ngx_http_set_content_type(r) != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
582 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
583 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
584 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
585 if (mp4 == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
586 b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
587 if (b == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
588 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
589 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
590 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
591 b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t)); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
592 if (b->file == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
593 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
594 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
595 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
596 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
597 rc = ngx_http_send_header(r); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
598 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
599 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
600 return rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
601 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
602 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
603 if (mp4) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
604 return ngx_http_output_filter(r, mp4->out); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
605 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
606 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
607 b->file_pos = 0; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
608 b->file_last = of.size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
609 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
610 b->in_file = b->file_last ? 1 : 0; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
611 b->last_buf = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
612 b->last_in_chain = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
613 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
614 b->file->fd = of.fd; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
615 b->file->name = path; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
616 b->file->log = log; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
617 b->file->directio = of.is_directio; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
618 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
619 out.buf = b; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
620 out.next = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
621 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
622 return ngx_http_output_filter(r, &out); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
623 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
624 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
625 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
626 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
627 ngx_http_mp4_process(ngx_http_mp4_file_t *mp4) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
628 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
629 off_t start_offset, adjustment; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
630 ngx_int_t rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
631 ngx_uint_t i, j; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
632 ngx_chain_t **prev; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
633 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
634 ngx_http_mp4_conf_t *conf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
635 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
636 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
637 "mp4 start:%ui", mp4->start); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
638 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
639 conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
640 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
641 mp4->buffer_size = conf->buffer_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
642 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
643 rc = ngx_http_mp4_read_atom(mp4, ngx_http_mp4_atoms, mp4->end); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
644 if (rc != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
645 return rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
646 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
647 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
648 if (mp4->trak.nelts == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
649 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
650 "no mp4 trak atoms were found in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
651 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
652 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
653 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
654 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
655 if (mp4->mdat_atom.buf == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
656 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
657 "no mp4 mdat atom was found in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
658 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
659 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
660 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
661 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
662 prev = &mp4->out; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
663 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
664 if (mp4->ftyp_atom.buf) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
665 *prev = &mp4->ftyp_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
666 prev = &mp4->ftyp_atom.next; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
667 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
668 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
669 *prev = &mp4->moov_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
670 prev = &mp4->moov_atom.next; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
671 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
672 if (mp4->mvhd_atom.buf) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
673 mp4->moov_size += mp4->mvhd_atom_buf.last - mp4->mvhd_atom_buf.pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
674 *prev = &mp4->mvhd_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
675 prev = &mp4->mvhd_atom.next; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
676 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
677 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
678 start_offset = mp4->end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
679 trak = mp4->trak.elts; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
680 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
681 for (i = 0; i < mp4->trak.nelts; i++) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
682 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
683 if (ngx_http_mp4_update_stts_atom(mp4, &trak[i]) != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
684 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
685 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
686 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
687 if (ngx_http_mp4_update_stss_atom(mp4, &trak[i]) != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
688 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
689 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
690 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
691 ngx_http_mp4_update_ctts_atom(mp4, &trak[i]); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
692 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
693 if (ngx_http_mp4_update_stsc_atom(mp4, &trak[i]) != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
694 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
695 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
696 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
697 if (ngx_http_mp4_update_stsz_atom(mp4, &trak[i]) != NGX_OK) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
698 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
699 } |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
700 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
701 if (trak[i].out[NGX_HTTP_MP4_CO64_DATA].buf) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
702 if (ngx_http_mp4_update_co64_atom(mp4, &trak[i]) != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
703 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
704 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
705 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
706 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
707 if (ngx_http_mp4_update_stco_atom(mp4, &trak[i]) != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
708 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
709 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
710 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
711 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
712 ngx_http_mp4_update_stbl_atom(mp4, &trak[i]); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
713 ngx_http_mp4_update_minf_atom(mp4, &trak[i]); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
714 trak[i].size += trak[i].mdhd_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
715 trak[i].size += trak[i].hdlr_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
716 ngx_http_mp4_update_mdia_atom(mp4, &trak[i]); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
717 trak[i].size += trak[i].tkhd_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
718 ngx_http_mp4_update_trak_atom(mp4, &trak[i]); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
719 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
720 mp4->moov_size += trak[i].size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
721 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
722 if (start_offset > trak[i].start_offset) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
723 start_offset = trak[i].start_offset; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
724 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
725 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
726 *prev = &trak[i].out[NGX_HTTP_MP4_TRAK_ATOM]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
727 prev = &trak[i].out[NGX_HTTP_MP4_TRAK_ATOM].next; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
728 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
729 for (j = 0; j < NGX_HTTP_MP4_LAST_ATOM + 1; j++) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
730 if (trak[i].out[j].buf) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
731 *prev = &trak[i].out[j]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
732 prev = &trak[i].out[j].next; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
733 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
734 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
735 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
736 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
737 mp4->moov_size += 8; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
738 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
739 ngx_mp4_set_32value(mp4->moov_atom_header, mp4->moov_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
740 ngx_mp4_set_atom_name(mp4->moov_atom_header, 'm', 'o', 'o', 'v'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
741 mp4->content_length += mp4->moov_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
742 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
743 *prev = &mp4->mdat_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
744 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
745 adjustment = mp4->ftyp_size + mp4->moov_size |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
746 + ngx_http_mp4_update_mdat_atom(mp4, start_offset) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
747 - start_offset; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
748 |
4173
aaa936b2cab5
Merging r4089 missed in r4170 merge.
Igor Sysoev <igor@sysoev.ru>
parents:
4169
diff
changeset
|
749 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
750 "mp4 adjustment:%O", adjustment); |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
751 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
752 for (i = 0; i < mp4->trak.nelts; i++) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
753 if (trak[i].out[NGX_HTTP_MP4_CO64_DATA].buf) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
754 ngx_http_mp4_adjust_co64_atom(mp4, &trak[i], adjustment); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
755 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
756 ngx_http_mp4_adjust_stco_atom(mp4, &trak[i], (int32_t) adjustment); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
757 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
758 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
759 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
760 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
761 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
762 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
763 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
764 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
765 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
766 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
767 } ngx_mp4_atom_header_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
768 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
769 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
770 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
771 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
772 u_char size64[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
773 } ngx_mp4_atom_header64_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
774 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
775 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
776 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
777 ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
778 ngx_http_mp4_atom_handler_t *atom, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
779 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
780 off_t end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
781 size_t atom_header_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
782 u_char *atom_header, *atom_name; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
783 uint64_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
784 ngx_int_t rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
785 ngx_uint_t n; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
786 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
787 end = mp4->offset + atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
788 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
789 while (mp4->offset < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
790 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
791 if (ngx_http_mp4_read(mp4, sizeof(uint32_t)) != NGX_OK) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
792 return NGX_ERROR; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
793 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
794 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
795 atom_header = mp4->buffer_pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
796 atom_size = ngx_mp4_get_32value(atom_header); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
797 atom_header_size = sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
798 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
799 if (atom_size == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
800 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
801 "mp4 atom end"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
802 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
803 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
804 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
805 if (atom_size < sizeof(ngx_mp4_atom_header_t)) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
806 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
807 if (atom_size == 1) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
808 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
809 if (ngx_http_mp4_read(mp4, sizeof(ngx_mp4_atom_header64_t)) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
810 != NGX_OK) |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
811 { |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
812 return NGX_ERROR; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
813 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
814 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
815 /* 64-bit atom size */ |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
816 atom_header = mp4->buffer_pos; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
817 atom_size = ngx_mp4_get_64value(atom_header + 8); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
818 atom_header_size = sizeof(ngx_mp4_atom_header64_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
819 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
820 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
821 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
822 "\"%s\" mp4 atom is too small:%uL", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
823 mp4->file.name.data, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
824 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
825 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
826 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
827 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
828 if (ngx_http_mp4_read(mp4, sizeof(ngx_mp4_atom_header_t)) != NGX_OK) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
829 return NGX_ERROR; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
830 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
831 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
832 atom_header = mp4->buffer_pos; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
833 atom_name = atom_header + sizeof(uint32_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
834 |
4173
aaa936b2cab5
Merging r4089 missed in r4170 merge.
Igor Sysoev <igor@sysoev.ru>
parents:
4169
diff
changeset
|
835 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
836 "mp4 atom: %*s @%O:%uL", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
837 4, atom_name, mp4->offset, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
838 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
839 if (atom_size > (uint64_t) (NGX_MAX_OFF_T_VALUE - mp4->offset) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
840 || mp4->offset + (off_t) atom_size > end) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
841 { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
842 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
843 "\"%s\" mp4 atom too large:%uL", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
844 mp4->file.name.data, atom_size); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
845 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
846 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
847 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
848 for (n = 0; atom[n].name; n++) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
849 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
850 if (ngx_strncmp(atom_name, atom[n].name, 4) == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
851 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
852 ngx_mp4_atom_next(mp4, atom_header_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
853 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
854 rc = atom[n].handler(mp4, atom_size - atom_header_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
855 if (rc != NGX_OK) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
856 return rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
857 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
858 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
859 goto next; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
860 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
861 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
862 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
863 ngx_mp4_atom_next(mp4, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
864 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
865 next: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
866 continue; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
867 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
868 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
869 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
870 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
871 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
872 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
873 static ngx_int_t |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
874 ngx_http_mp4_read(ngx_http_mp4_file_t *mp4, size_t size) |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
875 { |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
876 ssize_t n; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
877 |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
878 if (mp4->buffer_pos + size <= mp4->buffer_end) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
879 return NGX_OK; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
880 } |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
881 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
882 if (mp4->offset + (off_t) mp4->buffer_size > mp4->end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
883 mp4->buffer_size = (size_t) (mp4->end - mp4->offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
884 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
885 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
886 if (mp4->buffer_size < size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
887 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
888 "\"%s\" mp4 file truncated", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
889 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
890 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
891 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
892 if (mp4->buffer == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
893 mp4->buffer = ngx_palloc(mp4->request->pool, mp4->buffer_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
894 if (mp4->buffer == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
895 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
896 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
897 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
898 mp4->buffer_start = mp4->buffer; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
899 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
900 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
901 n = ngx_read_file(&mp4->file, mp4->buffer_start, mp4->buffer_size, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
902 mp4->offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
903 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
904 if (n == NGX_ERROR) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
905 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
906 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
907 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
908 if ((size_t) n != mp4->buffer_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
909 ngx_log_error(NGX_LOG_CRIT, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
910 ngx_read_file_n " read only %z of %z from \"%s\"", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
911 n, mp4->buffer_size, mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
912 return NGX_ERROR; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
913 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
914 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
915 mp4->buffer_pos = mp4->buffer_start; |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
916 mp4->buffer_end = mp4->buffer_start + mp4->buffer_size; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
917 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
918 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
919 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
920 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
921 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
922 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
923 ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
924 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
925 u_char *ftyp_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
926 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
927 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
928 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
929 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 ftyp atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
930 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
931 if (atom_data_size > 1024 |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
932 || ngx_mp4_atom_data(mp4) + atom_data_size > mp4->buffer_end) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
933 { |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
934 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
935 "\"%s\" mp4 ftyp atom is too large:%uL", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
936 mp4->file.name.data, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
937 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
938 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
939 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
940 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
941 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
942 ftyp_atom = ngx_palloc(mp4->request->pool, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
943 if (ftyp_atom == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
944 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
945 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
946 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
947 ngx_mp4_set_32value(ftyp_atom, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
948 ngx_mp4_set_atom_name(ftyp_atom, 'f', 't', 'y', 'p'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
949 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
950 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
951 * only moov atom content is guaranteed to be in mp4->buffer |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
952 * during sending response, so ftyp atom content should be copied |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
953 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
954 ngx_memcpy(ftyp_atom + sizeof(ngx_mp4_atom_header_t), |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
955 ngx_mp4_atom_data(mp4), (size_t) atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
956 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
957 atom = &mp4->ftyp_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
958 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
959 atom->pos = ftyp_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
960 atom->last = ftyp_atom + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
961 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
962 mp4->ftyp_atom.buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
963 mp4->ftyp_size = atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
964 mp4->content_length = atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
965 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
966 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
967 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
968 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
969 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
970 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
971 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
972 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
973 * Small excess buffer to process atoms after moov atom, mp4->buffer_start |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
974 * will be set to this buffer part after moov atom processing. |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
975 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
976 #define NGX_HTTP_MP4_MOOV_BUFFER_EXCESS (4 * 1024) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
977 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
978 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
979 ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
980 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
981 ngx_int_t rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
982 ngx_uint_t no_mdat; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
983 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
984 ngx_http_mp4_conf_t *conf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
985 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
986 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 moov atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
987 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
988 no_mdat = (mp4->mdat_atom.buf == NULL); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
989 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
990 if (no_mdat && mp4->start == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
991 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
992 * send original file if moov atom resides before |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
993 * mdat atom and client requests integral file |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
994 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
995 return NGX_DECLINED; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
996 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
997 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
998 conf = ngx_http_get_module_loc_conf(mp4->request, ngx_http_mp4_module); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
999 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1000 if (atom_data_size > mp4->buffer_size) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1001 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1002 if (atom_data_size > conf->max_buffer_size) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1003 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1004 "\"%s\" mp4 moov atom is too large:%uL, " |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1005 "you may want to increase mp4_max_buffer_size", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1006 mp4->file.name.data, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1007 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1008 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1009 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1010 ngx_pfree(mp4->request->pool, mp4->buffer); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1011 mp4->buffer = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1012 mp4->buffer_pos = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1013 mp4->buffer_end = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1014 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1015 mp4->buffer_size = (size_t) atom_data_size |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1016 + NGX_HTTP_MP4_MOOV_BUFFER_EXCESS * no_mdat; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1017 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1018 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1019 mp4->trak.elts = &mp4->traks; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1020 mp4->trak.size = sizeof(ngx_http_mp4_trak_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1021 mp4->trak.nalloc = 2; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1022 mp4->trak.pool = mp4->request->pool; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1023 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1024 atom = &mp4->moov_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1025 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1026 atom->pos = mp4->moov_atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1027 atom->last = mp4->moov_atom_header + 8; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1028 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1029 mp4->moov_atom.buf = &mp4->moov_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1030 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1031 rc = ngx_http_mp4_read_atom(mp4, ngx_http_mp4_moov_atoms, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1032 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1033 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 moov atom done"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1034 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1035 if (no_mdat) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1036 mp4->buffer_start = mp4->buffer_pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1037 mp4->buffer_size = NGX_HTTP_MP4_MOOV_BUFFER_EXCESS; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1038 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1039 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1040 /* skip atoms after moov atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1041 mp4->offset = mp4->end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1042 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1043 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1044 return rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1045 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1046 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1047 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1048 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1049 ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1050 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1051 ngx_buf_t *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1052 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1053 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdat atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1054 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1055 data = &mp4->mdat_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1056 data->file = &mp4->file; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1057 data->in_file = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1058 data->last_buf = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1059 data->last_in_chain = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1060 data->file_last = mp4->offset + atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1061 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1062 mp4->mdat_atom.buf = &mp4->mdat_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1063 mp4->mdat_atom.next = &mp4->mdat_data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1064 mp4->mdat_data.buf = data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1065 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1066 if (mp4->trak.nelts) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1067 /* skip atoms after mdat atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1068 mp4->offset = mp4->end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1069 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1070 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1071 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1072 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1073 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1074 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1075 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1076 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1077 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1078 static size_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1079 ngx_http_mp4_update_mdat_atom(ngx_http_mp4_file_t *mp4, off_t start_offset) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1080 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1081 off_t atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1082 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1083 uint32_t atom_header_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1084 uint64_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1085 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1086 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1087 atom_data_size = mp4->mdat_data.buf->file_last - start_offset; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1088 mp4->mdat_data.buf->file_pos = start_offset; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1089 |
4173
aaa936b2cab5
Merging r4089 missed in r4170 merge.
Igor Sysoev <igor@sysoev.ru>
parents:
4169
diff
changeset
|
1090 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1091 "mdat new offset @%O:%O", start_offset, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1092 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1093 atom_header = mp4->mdat_atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1094 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1095 if ((uint64_t) atom_data_size > 0xffffffff) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1096 atom_size = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1097 atom_header_size = sizeof(ngx_mp4_atom_header64_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1098 ngx_mp4_set_64value(atom_header + sizeof(ngx_mp4_atom_header_t), |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1099 sizeof(ngx_mp4_atom_header64_t) + atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1100 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1101 atom_size = sizeof(ngx_mp4_atom_header_t) + atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1102 atom_header_size = sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1103 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1104 |
4289 | 1105 mp4->content_length += atom_header_size + atom_data_size; |
1106 | |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1107 ngx_mp4_set_32value(atom_header, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1108 ngx_mp4_set_atom_name(atom_header, 'm', 'd', 'a', 't'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1109 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1110 atom = &mp4->mdat_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1111 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1112 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1113 atom->last = atom_header + atom_header_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1114 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1115 return atom_header_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1116 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1117 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1118 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1119 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1120 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1121 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1122 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1123 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1124 u_char creation_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1125 u_char modification_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1126 u_char timescale[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1127 u_char duration[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1128 u_char rate[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1129 u_char volume[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1130 u_char reserved[10]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1131 u_char matrix[36]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1132 u_char preview_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1133 u_char preview_duration[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1134 u_char poster_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1135 u_char selection_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1136 u_char selection_duration[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1137 u_char current_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1138 u_char next_track_id[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1139 } ngx_mp4_mvhd_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1140 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1141 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1142 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1143 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1144 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1145 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1146 u_char creation_time[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1147 u_char modification_time[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1148 u_char timescale[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1149 u_char duration[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1150 u_char rate[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1151 u_char volume[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1152 u_char reserved[10]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1153 u_char matrix[36]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1154 u_char preview_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1155 u_char preview_duration[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1156 u_char poster_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1157 u_char selection_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1158 u_char selection_duration[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1159 u_char current_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1160 u_char next_track_id[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1161 } ngx_mp4_mvhd64_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1162 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1163 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1164 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1165 ngx_http_mp4_read_mvhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1166 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1167 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1168 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1169 uint32_t timescale; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1170 uint64_t duration; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1171 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1172 ngx_mp4_mvhd_atom_t *mvhd_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1173 ngx_mp4_mvhd64_atom_t *mvhd64_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1174 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1175 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mvhd atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1176 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1177 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1178 mvhd_atom = (ngx_mp4_mvhd_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1179 mvhd64_atom = (ngx_mp4_mvhd64_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1180 ngx_mp4_set_atom_name(atom_header, 'm', 'v', 'h', 'd'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1181 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1182 if (ngx_mp4_atom_data_size(ngx_mp4_mvhd_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1183 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1184 "\"%s\" mp4 mvhd atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1185 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1186 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1187 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1188 if (mvhd_atom->version[0] == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1189 /* version 0: 32-bit duration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1190 timescale = ngx_mp4_get_32value(mvhd_atom->timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1191 duration = ngx_mp4_get_32value(mvhd_atom->duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1192 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1193 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1194 /* version 1: 64-bit duration */ |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1195 |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1196 if (ngx_mp4_atom_data_size(ngx_mp4_mvhd64_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1197 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1198 "\"%s\" mp4 mvhd atom too small", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1199 mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1200 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1201 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1202 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1203 timescale = ngx_mp4_get_32value(mvhd64_atom->timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1204 duration = ngx_mp4_get_64value(mvhd64_atom->duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1205 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1206 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1207 mp4->timescale = timescale; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1208 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1209 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1210 "mvhd timescale:%uD, duration:%uL, time:%.3fs", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1211 timescale, duration, (double) duration / timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1212 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1213 duration -= (uint64_t) mp4->start * timescale / 1000; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1214 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1215 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1216 "mvhd new duration:%uL, time:%.3fs", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1217 duration, (double) duration / timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1218 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1219 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1220 ngx_mp4_set_32value(mvhd_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1221 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1222 if (mvhd_atom->version[0] == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1223 ngx_mp4_set_32value(mvhd_atom->duration, duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1224 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1225 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1226 ngx_mp4_set_64value(mvhd64_atom->duration, duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1227 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1228 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1229 atom = &mp4->mvhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1230 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1231 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1232 atom->last = atom_header + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1233 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1234 mp4->mvhd_atom.buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1235 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1236 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1237 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1238 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1239 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1240 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1241 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1242 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1243 ngx_http_mp4_read_trak_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1244 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1245 u_char *atom_header, *atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1246 off_t atom_file_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1247 ngx_int_t rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1248 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1249 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1250 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1251 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 trak atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1252 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1253 trak = ngx_array_push(&mp4->trak); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1254 if (trak == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1255 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1256 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1257 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1258 ngx_memzero(trak, sizeof(ngx_http_mp4_trak_t)); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1259 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1260 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1261 ngx_mp4_set_atom_name(atom_header, 't', 'r', 'a', 'k'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1262 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1263 atom = &trak->trak_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1264 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1265 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1266 atom->last = atom_header + sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1267 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1268 trak->out[NGX_HTTP_MP4_TRAK_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1269 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1270 atom_end = mp4->buffer_pos + atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1271 atom_file_end = mp4->offset + atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1272 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1273 rc = ngx_http_mp4_read_atom(mp4, ngx_http_mp4_trak_atoms, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1274 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1275 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1276 "mp4 trak atom: %i", rc); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1277 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1278 if (rc == NGX_DECLINED) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1279 /* skip this trak */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1280 ngx_memzero(trak, sizeof(ngx_http_mp4_trak_t)); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1281 mp4->trak.nelts--; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1282 mp4->buffer_pos = atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1283 mp4->offset = atom_file_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1284 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1285 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1286 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1287 return rc; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1288 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1289 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1290 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1291 static void |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1292 ngx_http_mp4_update_trak_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1293 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1294 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1295 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1296 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1297 trak->size += sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1298 atom = &trak->trak_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1299 ngx_mp4_set_32value(atom->pos, trak->size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1300 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1301 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1302 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1303 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1304 ngx_http_mp4_read_cmov_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1305 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1306 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1307 "\"%s\" mp4 compressed moov atom (cmov) is not supported", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1308 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1309 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1310 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1311 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1312 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1313 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1314 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1315 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1316 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1317 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1318 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1319 u_char creation_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1320 u_char modification_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1321 u_char track_id[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1322 u_char reserved1[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1323 u_char duration[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1324 u_char reserved2[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1325 u_char layer[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1326 u_char group[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1327 u_char volume[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1328 u_char reverved3[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1329 u_char matrix[36]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1330 u_char width[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1331 u_char heigth[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1332 } ngx_mp4_tkhd_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1333 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1334 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1335 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1336 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1337 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1338 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1339 u_char creation_time[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1340 u_char modification_time[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1341 u_char track_id[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1342 u_char reserved1[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1343 u_char duration[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1344 u_char reserved2[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1345 u_char layer[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1346 u_char group[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1347 u_char volume[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1348 u_char reverved3[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1349 u_char matrix[36]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1350 u_char width[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1351 u_char heigth[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1352 } ngx_mp4_tkhd64_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1353 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1354 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1355 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1356 ngx_http_mp4_read_tkhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1357 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1358 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1359 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1360 uint64_t duration; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1361 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1362 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1363 ngx_mp4_tkhd_atom_t *tkhd_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1364 ngx_mp4_tkhd64_atom_t *tkhd64_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1365 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1366 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 tkhd atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1367 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1368 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1369 tkhd_atom = (ngx_mp4_tkhd_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1370 tkhd64_atom = (ngx_mp4_tkhd64_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1371 ngx_mp4_set_atom_name(tkhd_atom, 't', 'k', 'h', 'd'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1372 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1373 if (ngx_mp4_atom_data_size(ngx_mp4_tkhd_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1374 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1375 "\"%s\" mp4 tkhd atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1376 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1377 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1378 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1379 if (tkhd_atom->version[0] == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1380 /* version 0: 32-bit duration */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1381 duration = ngx_mp4_get_32value(tkhd_atom->duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1382 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1383 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1384 /* version 1: 64-bit duration */ |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1385 |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1386 if (ngx_mp4_atom_data_size(ngx_mp4_tkhd64_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1387 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1388 "\"%s\" mp4 tkhd atom too small", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1389 mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1390 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1391 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1392 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1393 duration = ngx_mp4_get_64value(tkhd64_atom->duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1394 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1395 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1396 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1397 "tkhd duration:%uL, time:%.3fs", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1398 duration, (double) duration / mp4->timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1399 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1400 duration -= (uint64_t) mp4->start * mp4->timescale / 1000; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1401 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1402 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1403 "tkhd new duration:%uL, time:%.3fs", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1404 duration, (double) duration / mp4->timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1405 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1406 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1407 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1408 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1409 trak->tkhd_size = atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1410 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1411 ngx_mp4_set_32value(tkhd_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1412 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1413 if (tkhd_atom->version[0] == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1414 ngx_mp4_set_32value(tkhd_atom->duration, duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1415 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1416 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1417 ngx_mp4_set_64value(tkhd64_atom->duration, duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1418 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1419 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1420 atom = &trak->tkhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1421 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1422 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1423 atom->last = atom_header + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1424 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1425 trak->out[NGX_HTTP_MP4_TKHD_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1426 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1427 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1428 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1429 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1430 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1431 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1432 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1433 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1434 ngx_http_mp4_read_mdia_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1435 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1436 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1437 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1438 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1439 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1440 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "process mdia atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1441 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1442 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1443 ngx_mp4_set_atom_name(atom_header, 'm', 'd', 'i', 'a'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1444 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1445 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1446 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1447 atom = &trak->mdia_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1448 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1449 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1450 atom->last = atom_header + sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1451 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1452 trak->out[NGX_HTTP_MP4_MDIA_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1453 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1454 return ngx_http_mp4_read_atom(mp4, ngx_http_mp4_mdia_atoms, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1455 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1456 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1457 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1458 static void |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1459 ngx_http_mp4_update_mdia_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1460 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1461 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1462 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1463 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1464 trak->size += sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1465 atom = &trak->mdia_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1466 ngx_mp4_set_32value(atom->pos, trak->size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1467 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1468 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1469 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1470 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1471 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1472 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1473 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1474 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1475 u_char creation_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1476 u_char modification_time[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1477 u_char timescale[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1478 u_char duration[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1479 u_char language[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1480 u_char quality[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1481 } ngx_mp4_mdhd_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1482 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1483 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1484 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1485 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1486 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1487 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1488 u_char creation_time[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1489 u_char modification_time[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1490 u_char timescale[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1491 u_char duration[8]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1492 u_char language[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1493 u_char quality[2]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1494 } ngx_mp4_mdhd64_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1495 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1496 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1497 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1498 ngx_http_mp4_read_mdhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1499 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1500 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1501 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1502 uint32_t timescale; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1503 uint64_t duration; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1504 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1505 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1506 ngx_mp4_mdhd_atom_t *mdhd_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1507 ngx_mp4_mdhd64_atom_t *mdhd64_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1508 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1509 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 mdhd atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1510 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1511 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1512 mdhd_atom = (ngx_mp4_mdhd_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1513 mdhd64_atom = (ngx_mp4_mdhd64_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1514 ngx_mp4_set_atom_name(mdhd_atom, 'm', 'd', 'h', 'd'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1515 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1516 if (ngx_mp4_atom_data_size(ngx_mp4_mdhd_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1517 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1518 "\"%s\" mp4 mdhd atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1519 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1520 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1521 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1522 if (mdhd_atom->version[0] == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1523 /* version 0: everything is 32-bit */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1524 timescale = ngx_mp4_get_32value(mdhd_atom->timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1525 duration = ngx_mp4_get_32value(mdhd_atom->duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1526 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1527 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1528 /* version 1: 64-bit duration and 32-bit timescale */ |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1529 |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1530 if (ngx_mp4_atom_data_size(ngx_mp4_mdhd64_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1531 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1532 "\"%s\" mp4 mdhd atom too small", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1533 mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1534 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1535 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1536 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1537 timescale = ngx_mp4_get_32value(mdhd64_atom->timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1538 duration = ngx_mp4_get_64value(mdhd64_atom->duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1539 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1540 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1541 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1542 "mdhd timescale:%uD, duration:%uL, time:%.3fs", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1543 timescale, duration, (double) duration / timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1544 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1545 duration -= (uint64_t) mp4->start * timescale / 1000; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1546 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1547 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1548 "mdhd new duration:%uL, time:%.3fs", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1549 duration, (double) duration / timescale); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1550 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1551 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1552 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1553 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1554 trak->mdhd_size = atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1555 trak->timescale = timescale; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1556 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1557 ngx_mp4_set_32value(mdhd_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1558 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1559 if (mdhd_atom->version[0] == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1560 ngx_mp4_set_32value(mdhd_atom->duration, duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1561 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1562 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1563 ngx_mp4_set_64value(mdhd64_atom->duration, duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1564 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1565 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1566 atom = &trak->mdhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1567 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1568 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1569 atom->last = atom_header + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1570 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1571 trak->out[NGX_HTTP_MP4_MDHD_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1572 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1573 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1574 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1575 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1576 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1577 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1578 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1579 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1580 ngx_http_mp4_read_hdlr_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1581 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1582 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1583 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1584 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1585 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1586 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1587 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 hdlr atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1588 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1589 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1590 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1591 ngx_mp4_set_32value(atom_header, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1592 ngx_mp4_set_atom_name(atom_header, 'h', 'd', 'l', 'r'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1593 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1594 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1595 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1596 atom = &trak->hdlr_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1597 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1598 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1599 atom->last = atom_header + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1600 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1601 trak->hdlr_size = atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1602 trak->out[NGX_HTTP_MP4_HDLR_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1603 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1604 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1605 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1606 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1607 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1608 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1609 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1610 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1611 ngx_http_mp4_read_minf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1612 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1613 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1614 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1615 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1616 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1617 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "process minf atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1618 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1619 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1620 ngx_mp4_set_atom_name(atom_header, 'm', 'i', 'n', 'f'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1621 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1622 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1623 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1624 atom = &trak->minf_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1625 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1626 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1627 atom->last = atom_header + sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1628 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1629 trak->out[NGX_HTTP_MP4_MINF_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1630 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1631 return ngx_http_mp4_read_atom(mp4, ngx_http_mp4_minf_atoms, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1632 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1633 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1634 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1635 static void |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1636 ngx_http_mp4_update_minf_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1637 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1638 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1639 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1640 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1641 trak->size += sizeof(ngx_mp4_atom_header_t) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1642 + trak->vmhd_size |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1643 + trak->smhd_size |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1644 + trak->dinf_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1645 atom = &trak->minf_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1646 ngx_mp4_set_32value(atom->pos, trak->size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1647 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1648 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1649 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1650 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1651 ngx_http_mp4_read_vmhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1652 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1653 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1654 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1655 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1656 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1657 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1658 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 vmhd atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1659 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1660 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1661 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1662 ngx_mp4_set_32value(atom_header, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1663 ngx_mp4_set_atom_name(atom_header, 'v', 'm', 'h', 'd'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1664 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1665 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1666 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1667 atom = &trak->vmhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1668 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1669 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1670 atom->last = atom_header + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1671 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1672 trak->vmhd_size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1673 trak->out[NGX_HTTP_MP4_VMHD_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1674 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1675 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1676 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1677 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1678 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1679 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1680 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1681 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1682 ngx_http_mp4_read_smhd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1683 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1684 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1685 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1686 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1687 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1688 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1689 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 smhd atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1690 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1691 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1692 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1693 ngx_mp4_set_32value(atom_header, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1694 ngx_mp4_set_atom_name(atom_header, 's', 'm', 'h', 'd'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1695 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1696 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1697 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1698 atom = &trak->smhd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1699 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1700 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1701 atom->last = atom_header + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1702 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1703 trak->vmhd_size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1704 trak->out[NGX_HTTP_MP4_SMHD_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1705 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1706 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1707 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1708 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1709 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1710 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1711 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1712 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1713 ngx_http_mp4_read_dinf_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1714 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1715 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1716 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1717 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1718 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1719 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1720 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 dinf atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1721 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1722 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1723 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1724 ngx_mp4_set_32value(atom_header, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1725 ngx_mp4_set_atom_name(atom_header, 'd', 'i', 'n', 'f'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1726 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1727 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1728 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1729 atom = &trak->dinf_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1730 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1731 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1732 atom->last = atom_header + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1733 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1734 trak->dinf_size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1735 trak->out[NGX_HTTP_MP4_DINF_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1736 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1737 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1738 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1739 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1740 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1741 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1742 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1743 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1744 ngx_http_mp4_read_stbl_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1745 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1746 u_char *atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1747 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1748 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1749 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1750 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "process stbl atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1751 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1752 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1753 ngx_mp4_set_atom_name(atom_header, 's', 't', 'b', 'l'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1754 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1755 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1756 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1757 atom = &trak->stbl_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1758 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1759 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1760 atom->last = atom_header + sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1761 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1762 trak->out[NGX_HTTP_MP4_STBL_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1763 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1764 return ngx_http_mp4_read_atom(mp4, ngx_http_mp4_stbl_atoms, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1765 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1766 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1767 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1768 static void |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1769 ngx_http_mp4_update_stbl_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1770 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1771 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1772 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1773 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1774 trak->size += sizeof(ngx_mp4_atom_header_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1775 atom = &trak->stbl_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1776 ngx_mp4_set_32value(atom->pos, trak->size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1777 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1778 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1779 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1780 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1781 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1782 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1783 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1784 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1785 u_char entries[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1786 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1787 u_char media_size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1788 u_char media_name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1789 } ngx_mp4_stsd_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1790 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1791 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1792 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1793 ngx_http_mp4_read_stsd_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1794 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1795 u_char *atom_header, *atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1796 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1797 ngx_buf_t *atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1798 ngx_mp4_stsd_atom_t *stsd_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1799 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1800 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1801 /* sample description atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1802 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1803 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stsd atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1804 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1805 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1806 stsd_atom = (ngx_mp4_stsd_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1807 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1808 atom_table = atom_header + atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1809 ngx_mp4_set_32value(stsd_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1810 ngx_mp4_set_atom_name(stsd_atom, 's', 't', 's', 'd'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1811 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1812 if (ngx_mp4_atom_data_size(ngx_mp4_stsd_atom_t) > atom_data_size) { |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1813 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1814 "\"%s\" mp4 stsd atom too small", mp4->file.name.data); |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1815 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1816 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1817 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1818 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1819 "stsd entries:%uD, media:%*s", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1820 ngx_mp4_get_32value(stsd_atom->entries), |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1821 4, stsd_atom->media_name); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1822 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1823 /* supported media format: "avc1" (H.264) and "mp4a" (MPEG-4/AAC) */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1824 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1825 if (ngx_strncmp(stsd_atom->media_name, "avc1", 4) != 0 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1826 && ngx_strncmp(stsd_atom->media_name, "mp4a", 4) != 0) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1827 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1828 return NGX_DECLINED; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1829 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1830 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1831 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1832 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1833 atom = &trak->stsd_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1834 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1835 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1836 atom->last = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1837 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1838 trak->out[NGX_HTTP_MP4_STSD_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1839 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1840 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1841 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1842 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1843 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1844 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1845 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1846 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1847 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1848 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1849 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1850 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1851 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1852 u_char entries[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1853 } ngx_mp4_stts_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1854 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1855 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1856 u_char count[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1857 u_char duration[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1858 } ngx_mp4_stts_entry_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1859 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1860 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1861 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1862 ngx_http_mp4_read_stts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1863 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1864 u_char *atom_header, *atom_table, *atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1865 uint32_t entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1866 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1867 ngx_mp4_stts_atom_t *stts_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1868 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1869 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1870 /* time-to-sample atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1871 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1872 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stts atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1873 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1874 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1875 stts_atom = (ngx_mp4_stts_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1876 ngx_mp4_set_atom_name(stts_atom, 's', 't', 't', 's'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1877 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1878 if (ngx_mp4_atom_data_size(ngx_mp4_stts_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1879 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1880 "\"%s\" mp4 stts atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1881 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1882 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1883 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1884 entries = ngx_mp4_get_32value(stts_atom->entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1885 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1886 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1887 "mp4 time-to-sample entries:%uD", entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1888 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1889 if (ngx_mp4_atom_data_size(ngx_mp4_stts_atom_t) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1890 + entries * sizeof(ngx_mp4_stts_entry_t) > atom_data_size) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1891 { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1892 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1893 "\"%s\" mp4 stts atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1894 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1895 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1896 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1897 atom_table = atom_header + sizeof(ngx_mp4_stts_atom_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1898 atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1899 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1900 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1901 trak->time_to_sample_entries = entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1902 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1903 atom = &trak->stts_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1904 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1905 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1906 atom->last = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1907 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1908 data = &trak->stts_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1909 data->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1910 data->pos = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1911 data->last = atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1912 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1913 trak->out[NGX_HTTP_MP4_STTS_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1914 trak->out[NGX_HTTP_MP4_STTS_DATA].buf = data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1915 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1916 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1917 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1918 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1919 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1920 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1921 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1922 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1923 ngx_http_mp4_update_stts_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1924 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1925 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1926 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1927 uint32_t entries, count, duration; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1928 uint64_t start_time; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1929 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1930 ngx_uint_t start_sample; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1931 ngx_mp4_stts_atom_t *stts_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1932 ngx_mp4_stts_entry_t *entry, *end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1933 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1934 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1935 * mdia.minf.stbl.stts updating requires trak->timescale |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1936 * from mdia.mdhd atom which may reside after mdia.minf |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1937 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1938 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1939 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1940 "mp4 stts atom update"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1941 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1942 data = trak->out[NGX_HTTP_MP4_STTS_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1943 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1944 if (data == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1945 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1946 "no mp4 stts atoms were found in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1947 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1948 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1949 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1950 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1951 entries = trak->time_to_sample_entries; |
4251 | 1952 start_time = (uint64_t) mp4->start * trak->timescale / 1000; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1953 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1954 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1955 "time-to-sample start_time:%uL", start_time); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1956 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1957 start_sample = 0; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1958 entry = (ngx_mp4_stts_entry_t *) data->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1959 end = (ngx_mp4_stts_entry_t *) data->last; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1960 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1961 while (entry < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1962 count = ngx_mp4_get_32value(entry->count); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1963 duration = ngx_mp4_get_32value(entry->duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1964 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1965 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1966 "count:%uD, duration:%uD", count, duration); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1967 |
4365 | 1968 if (start_time < (uint64_t) count * duration) { |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1969 start_sample += (ngx_uint_t) (start_time / duration); |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
1970 count -= (uint32_t) (start_time / duration); |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1971 ngx_mp4_set_32value(entry->count, count); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1972 goto found; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1973 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1974 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1975 start_sample += count; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1976 start_time -= count * duration; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1977 entries--; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1978 entry++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1979 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1980 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1981 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1982 "start time is out mp4 stts samples in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1983 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1984 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1985 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1986 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1987 found: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1988 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1989 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1990 "start_sample:%ui, new count:%uD", start_sample, count); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1991 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1992 trak->start_sample = start_sample; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1993 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1994 data->pos = (u_char *) entry; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1995 atom_size = sizeof(ngx_mp4_stts_atom_t) + (data->last - data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1996 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1997 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1998 atom = trak->out[NGX_HTTP_MP4_STTS_ATOM].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
1999 stts_atom = (ngx_mp4_stts_atom_t *) atom->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2000 ngx_mp4_set_32value(stts_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2001 ngx_mp4_set_32value(stts_atom->entries, entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2002 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2003 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2004 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2005 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2006 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2007 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2008 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2009 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2010 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2011 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2012 u_char entries[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2013 } ngx_http_mp4_stss_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2014 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2015 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2016 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2017 ngx_http_mp4_read_stss_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2018 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2019 u_char *atom_header, *atom_table, *atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2020 uint32_t entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2021 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2022 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2023 ngx_http_mp4_stss_atom_t *stss_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2024 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2025 /* sync samples atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2026 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2027 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stss atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2028 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2029 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2030 stss_atom = (ngx_http_mp4_stss_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2031 ngx_mp4_set_atom_name(stss_atom, 's', 't', 's', 's'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2032 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2033 if (ngx_mp4_atom_data_size(ngx_http_mp4_stss_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2034 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2035 "\"%s\" mp4 stss atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2036 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2037 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2038 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2039 entries = ngx_mp4_get_32value(stss_atom->entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2040 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2041 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2042 "sync sample entries:%uD", entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2043 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2044 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2045 trak->sync_samples_entries = entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2046 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2047 atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2048 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2049 atom = &trak->stss_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2050 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2051 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2052 atom->last = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2053 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2054 if (ngx_mp4_atom_data_size(ngx_http_mp4_stss_atom_t) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2055 + entries * sizeof(uint32_t) > atom_data_size) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2056 { |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2057 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2058 "\"%s\" mp4 stss atom too small", mp4->file.name.data); |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2059 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2060 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2061 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2062 atom_end = atom_table + entries * sizeof(uint32_t); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2063 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2064 data = &trak->stss_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2065 data->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2066 data->pos = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2067 data->last = atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2068 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2069 trak->out[NGX_HTTP_MP4_STSS_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2070 trak->out[NGX_HTTP_MP4_STSS_DATA].buf = data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2071 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2072 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2073 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2074 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2075 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2076 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2077 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2078 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2079 ngx_http_mp4_update_stss_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2080 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2081 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2082 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2083 uint32_t entries, sample, start_sample, *entry, *end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2084 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2085 ngx_http_mp4_stss_atom_t *stss_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2086 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2087 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2088 * mdia.minf.stbl.stss updating requires trak->start_sample |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2089 * from mdia.minf.stbl.stts which depends on value from mdia.mdhd |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2090 * atom which may reside after mdia.minf |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2091 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2092 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2093 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2094 "mp4 stss atom update"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2095 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2096 data = trak->out[NGX_HTTP_MP4_STSS_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2097 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2098 if (data == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2099 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2100 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2101 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2102 /* sync samples starts from 1 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2103 start_sample = trak->start_sample + 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2104 entries = trak->sync_samples_entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2105 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2106 entry = (uint32_t *) data->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2107 end = (uint32_t *) data->last; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2108 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2109 while (entry < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2110 sample = ngx_mp4_get_32value(entry); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2111 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2112 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2113 "start:%uD, sync:%uD", start_sample, sample); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2114 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2115 if (sample >= start_sample) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2116 goto found; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2117 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2118 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2119 entries--; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2120 entry++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2121 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2122 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2123 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2124 "start sample is out of mp4 stss atom in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2125 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2126 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2127 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2128 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2129 found: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2130 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2131 data->pos = (u_char *) entry; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2132 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2133 start_sample = trak->start_sample; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2134 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2135 while (entry < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2136 sample = ngx_mp4_get_32value(entry); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2137 sample -= start_sample; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2138 ngx_mp4_set_32value(entry, sample); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2139 entry++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2140 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2141 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2142 atom_size = sizeof(ngx_http_mp4_stss_atom_t) + (data->last - data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2143 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2144 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2145 atom = trak->out[NGX_HTTP_MP4_STSS_ATOM].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2146 stss_atom = (ngx_http_mp4_stss_atom_t *) atom->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2147 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2148 ngx_mp4_set_32value(stss_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2149 ngx_mp4_set_32value(stss_atom->entries, entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2150 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2151 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2152 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2153 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2154 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2155 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2156 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2157 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2158 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2159 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2160 u_char entries[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2161 } ngx_mp4_ctts_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2162 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2163 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2164 u_char count[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2165 u_char offset[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2166 } ngx_mp4_ctts_entry_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2167 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2168 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2169 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2170 ngx_http_mp4_read_ctts_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2171 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2172 u_char *atom_header, *atom_table, *atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2173 uint32_t entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2174 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2175 ngx_mp4_ctts_atom_t *ctts_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2176 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2177 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2178 /* composition offsets atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2179 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2180 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 ctts atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2181 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2182 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2183 ctts_atom = (ngx_mp4_ctts_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2184 ngx_mp4_set_atom_name(ctts_atom, 'c', 't', 't', 's'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2185 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2186 if (ngx_mp4_atom_data_size(ngx_mp4_ctts_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2187 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2188 "\"%s\" mp4 ctts atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2189 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2190 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2191 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2192 entries = ngx_mp4_get_32value(ctts_atom->entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2193 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2194 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2195 "composition offset entries:%uD", entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2196 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2197 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2198 trak->composition_offset_entries = entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2199 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2200 atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2201 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2202 atom = &trak->ctts_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2203 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2204 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2205 atom->last = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2206 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2207 if (ngx_mp4_atom_data_size(ngx_mp4_ctts_atom_t) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2208 + entries * sizeof(ngx_mp4_ctts_entry_t) > atom_data_size) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2209 { |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2210 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2211 "\"%s\" mp4 ctts atom too small", mp4->file.name.data); |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2212 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2213 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2214 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2215 atom_end = atom_table + entries * sizeof(ngx_mp4_ctts_entry_t); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2216 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2217 data = &trak->ctts_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2218 data->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2219 data->pos = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2220 data->last = atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2221 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2222 trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2223 trak->out[NGX_HTTP_MP4_CTTS_DATA].buf = data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2224 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2225 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2226 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2227 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2228 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2229 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2230 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2231 static void |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2232 ngx_http_mp4_update_ctts_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2233 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2234 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2235 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2236 uint32_t entries, count, start_sample; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2237 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2238 ngx_mp4_ctts_atom_t *ctts_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2239 ngx_mp4_ctts_entry_t *entry, *end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2240 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2241 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2242 * mdia.minf.stbl.ctts updating requires trak->start_sample |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2243 * from mdia.minf.stbl.stts which depends on value from mdia.mdhd |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2244 * atom which may reside after mdia.minf |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2245 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2246 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2247 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2248 "mp4 ctts atom update"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2249 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2250 data = trak->out[NGX_HTTP_MP4_CTTS_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2251 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2252 if (data == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2253 return; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2254 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2255 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2256 /* sync samples starts from 1 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2257 start_sample = trak->start_sample + 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2258 entries = trak->composition_offset_entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2259 entry = (ngx_mp4_ctts_entry_t *) data->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2260 end = (ngx_mp4_ctts_entry_t *) data->last; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2261 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2262 while (entry < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2263 count = ngx_mp4_get_32value(entry->count); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2264 |
4173
aaa936b2cab5
Merging r4089 missed in r4170 merge.
Igor Sysoev <igor@sysoev.ru>
parents:
4169
diff
changeset
|
2265 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2266 "start:%uD, count:%uD, offset:%uD", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2267 start_sample, count, ngx_mp4_get_32value(entry->offset)); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2268 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2269 if (start_sample <= count) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2270 count -= (start_sample - 1); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2271 ngx_mp4_set_32value(entry->count, count); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2272 goto found; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2273 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2274 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2275 start_sample -= count; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2276 entries--; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2277 entry++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2278 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2279 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2280 trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2281 trak->out[NGX_HTTP_MP4_CTTS_DATA].buf = NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2282 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2283 return; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2284 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2285 found: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2286 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2287 data->pos = (u_char *) entry; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2288 atom_size = sizeof(ngx_mp4_ctts_atom_t) + (data->last - data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2289 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2290 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2291 atom = trak->out[NGX_HTTP_MP4_CTTS_ATOM].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2292 ctts_atom = (ngx_mp4_ctts_atom_t *) atom->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2293 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2294 ngx_mp4_set_32value(ctts_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2295 ngx_mp4_set_32value(ctts_atom->entries, entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2296 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2297 return; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2298 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2299 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2300 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2301 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2302 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2303 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2304 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2305 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2306 u_char entries[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2307 } ngx_mp4_stsc_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2308 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2309 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2310 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2311 ngx_http_mp4_read_stsc_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2312 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2313 u_char *atom_header, *atom_table, *atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2314 uint32_t entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2315 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2316 ngx_mp4_stsc_atom_t *stsc_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2317 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2318 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2319 /* sample-to-chunk atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2320 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2321 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stsc atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2322 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2323 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2324 stsc_atom = (ngx_mp4_stsc_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2325 ngx_mp4_set_atom_name(stsc_atom, 's', 't', 's', 'c'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2326 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2327 if (ngx_mp4_atom_data_size(ngx_mp4_stsc_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2328 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2329 "\"%s\" mp4 stsc atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2330 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2331 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2332 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2333 entries = ngx_mp4_get_32value(stsc_atom->entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2334 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2335 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2336 "sample-to-chunk entries:%uD", entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2337 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2338 if (ngx_mp4_atom_data_size(ngx_mp4_stsc_atom_t) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2339 + entries * sizeof(ngx_mp4_stsc_entry_t) > atom_data_size) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2340 { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2341 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2342 "\"%s\" mp4 stsc atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2343 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2344 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2345 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2346 atom_table = atom_header + sizeof(ngx_mp4_stsc_atom_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2347 atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2348 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2349 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2350 trak->sample_to_chunk_entries = entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2351 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2352 atom = &trak->stsc_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2353 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2354 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2355 atom->last = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2356 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2357 data = &trak->stsc_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2358 data->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2359 data->pos = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2360 data->last = atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2361 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2362 trak->out[NGX_HTTP_MP4_STSC_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2363 trak->out[NGX_HTTP_MP4_STSC_DATA].buf = data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2364 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2365 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2366 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2367 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2368 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2369 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2370 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2371 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2372 ngx_http_mp4_update_stsc_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2373 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2374 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2375 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2376 uint32_t start_sample, entries, chunk, samples, id, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2377 next_chunk, n; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2378 ngx_buf_t *atom, *data, *buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2379 ngx_mp4_stsc_atom_t *stsc_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2380 ngx_mp4_stsc_entry_t *entry, *first, *end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2381 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2382 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2383 * mdia.minf.stbl.stsc updating requires trak->start_sample |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2384 * from mdia.minf.stbl.stts which depends on value from mdia.mdhd |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2385 * atom which may reside after mdia.minf |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2386 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2387 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2388 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2389 "mp4 stsc atom update"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2390 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2391 data = trak->out[NGX_HTTP_MP4_STSC_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2392 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2393 if (data == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2394 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2395 "no mp4 stsc atoms were found in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2396 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2397 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2398 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2399 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2400 if (trak->sample_to_chunk_entries == 0) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2401 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2402 "zero number of entries in stsc atom in \"%s\"", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2403 mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2404 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2405 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2406 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2407 start_sample = (uint32_t) trak->start_sample; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2408 entries = trak->sample_to_chunk_entries - 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2409 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2410 entry = (ngx_mp4_stsc_entry_t *) data->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2411 end = (ngx_mp4_stsc_entry_t *) data->last; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2412 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2413 chunk = ngx_mp4_get_32value(entry->chunk); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2414 samples = ngx_mp4_get_32value(entry->samples); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2415 id = ngx_mp4_get_32value(entry->id); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2416 entry++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2417 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2418 while (entry < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2419 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2420 next_chunk = ngx_mp4_get_32value(entry->chunk); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2421 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2422 ngx_log_debug5(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2423 "start_sample:%uD, chunk:%uD, chunks:%uD, " |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2424 "samples:%uD, id:%uD", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2425 start_sample, chunk, next_chunk - chunk, samples, id); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2426 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2427 n = (next_chunk - chunk) * samples; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2428 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2429 if (start_sample <= n) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2430 goto found; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2431 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2432 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2433 start_sample -= n; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2434 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2435 chunk = next_chunk; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2436 samples = ngx_mp4_get_32value(entry->samples); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2437 id = ngx_mp4_get_32value(entry->id); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2438 entries--; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2439 entry++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2440 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2441 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2442 next_chunk = trak->chunks; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2443 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2444 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2445 "start_sample:%uD, chunk:%uD, chunks:%uD, samples:%uD", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2446 start_sample, chunk, next_chunk - chunk, samples); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2447 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2448 n = (next_chunk - chunk) * samples; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2449 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2450 if (start_sample > n) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2451 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2452 "start time is out mp4 stsc chunks in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2453 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2454 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2455 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2456 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2457 found: |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2458 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2459 entries++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2460 entry--; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2461 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2462 if (samples == 0) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2463 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2464 "zero number of samples in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2465 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2466 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2467 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2468 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2469 trak->start_chunk = chunk - 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2470 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2471 trak->start_chunk += start_sample / samples; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2472 trak->chunk_samples = start_sample % samples; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2473 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2474 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2475 "start chunk:%ui, samples:%uD", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2476 trak->start_chunk, trak->chunk_samples); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2477 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2478 data->pos = (u_char *) entry; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2479 atom_size = sizeof(ngx_mp4_stsc_atom_t) + (data->last - data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2480 |
4441 | 2481 ngx_mp4_set_32value(entry->chunk, 1); |
2482 | |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2483 if (trak->chunk_samples) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2484 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2485 first = &trak->stsc_chunk_entry; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2486 ngx_mp4_set_32value(first->chunk, 1); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2487 ngx_mp4_set_32value(first->samples, samples - trak->chunk_samples); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2488 ngx_mp4_set_32value(first->id, id); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2489 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2490 buf = &trak->stsc_chunk_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2491 buf->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2492 buf->pos = (u_char *) first; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2493 buf->last = (u_char *) first + sizeof(ngx_mp4_stsc_entry_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2494 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2495 trak->out[NGX_HTTP_MP4_STSC_CHUNK].buf = buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2496 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2497 ngx_mp4_set_32value(entry->chunk, 2); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2498 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2499 atom_size += sizeof(ngx_mp4_stsc_entry_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2500 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2501 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2502 while (++entry < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2503 chunk = ngx_mp4_get_32value(entry->chunk); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2504 chunk -= trak->start_chunk; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2505 ngx_mp4_set_32value(entry->chunk, chunk); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2506 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2507 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2508 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2509 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2510 atom = trak->out[NGX_HTTP_MP4_STSC_ATOM].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2511 stsc_atom = (ngx_mp4_stsc_atom_t *) atom->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2512 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2513 ngx_mp4_set_32value(stsc_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2514 ngx_mp4_set_32value(stsc_atom->entries, entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2515 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2516 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2517 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2518 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2519 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2520 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2521 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2522 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2523 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2524 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2525 u_char uniform_size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2526 u_char entries[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2527 } ngx_mp4_stsz_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2528 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2529 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2530 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2531 ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2532 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2533 u_char *atom_header, *atom_table, *atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2534 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2535 uint32_t entries, size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2536 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2537 ngx_mp4_stsz_atom_t *stsz_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2538 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2539 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2540 /* sample sizes atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2541 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2542 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stsz atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2543 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2544 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2545 stsz_atom = (ngx_mp4_stsz_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2546 ngx_mp4_set_atom_name(stsz_atom, 's', 't', 's', 'z'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2547 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2548 if (ngx_mp4_atom_data_size(ngx_mp4_stsz_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2549 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2550 "\"%s\" mp4 stsz atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2551 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2552 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2553 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2554 size = ngx_mp4_get_32value(stsz_atom->uniform_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2555 entries = ngx_mp4_get_32value(stsz_atom->entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2556 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2557 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2558 "sample uniform size:%uD, entries:%uD", size, entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2559 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2560 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2561 trak->sample_sizes_entries = entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2562 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2563 atom_table = atom_header + sizeof(ngx_mp4_stsz_atom_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2564 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2565 atom = &trak->stsz_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2566 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2567 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2568 atom->last = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2569 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2570 trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2571 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2572 if (size == 0) { |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2573 if (ngx_mp4_atom_data_size(ngx_mp4_stsz_atom_t) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2574 + entries * sizeof(uint32_t) > atom_data_size) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2575 { |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2576 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2577 "\"%s\" mp4 stsz atom too small", |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2578 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2579 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2580 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2581 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2582 atom_end = atom_table + entries * sizeof(uint32_t); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2583 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2584 data = &trak->stsz_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2585 data->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2586 data->pos = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2587 data->last = atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2588 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2589 trak->out[NGX_HTTP_MP4_STSZ_DATA].buf = data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2590 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2591 } else { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2592 /* if size != 0 then all samples are the same size */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2593 /* TODO : chunk samples */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2594 atom_size = sizeof(ngx_mp4_atom_header_t) + (size_t) atom_data_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2595 ngx_mp4_set_32value(atom_header, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2596 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2597 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2598 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2599 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2600 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2601 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2602 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2603 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2604 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2605 static ngx_int_t |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2606 ngx_http_mp4_update_stsz_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2607 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2608 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2609 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2610 uint32_t *pos, *end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2611 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2612 ngx_mp4_stsz_atom_t *stsz_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2613 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2614 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2615 * mdia.minf.stbl.stsz updating requires trak->start_sample |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2616 * from mdia.minf.stbl.stts which depends on value from mdia.mdhd |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2617 * atom which may reside after mdia.minf |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2618 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2619 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2620 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2621 "mp4 stsz atom update"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2622 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2623 data = trak->out[NGX_HTTP_MP4_STSZ_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2624 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2625 if (data) { |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2626 if (trak->start_sample > trak->sample_sizes_entries) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2627 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2628 "start time is out mp4 stsz samples in \"%s\"", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2629 mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2630 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2631 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2632 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2633 data->pos += trak->start_sample * sizeof(uint32_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2634 end = (uint32_t *) data->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2635 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2636 for (pos = end - trak->chunk_samples; pos < end; pos++) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2637 trak->chunk_samples_size += ngx_mp4_get_32value(pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2638 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2639 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2640 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2641 "chunk samples sizes:%uL", trak->chunk_samples_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2642 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2643 atom_size = sizeof(ngx_mp4_stsz_atom_t) + (data->last - data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2644 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2645 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2646 atom = trak->out[NGX_HTTP_MP4_STSZ_ATOM].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2647 stsz_atom = (ngx_mp4_stsz_atom_t *) atom->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2648 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2649 ngx_mp4_set_32value(stsz_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2650 ngx_mp4_set_32value(stsz_atom->entries, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2651 trak->sample_sizes_entries - trak->start_sample); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2652 } |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2653 |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2654 return NGX_OK; |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2655 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2656 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2657 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2658 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2659 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2660 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2661 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2662 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2663 u_char entries[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2664 } ngx_mp4_stco_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2665 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2666 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2667 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2668 ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2669 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2670 u_char *atom_header, *atom_table, *atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2671 uint32_t entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2672 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2673 ngx_mp4_stco_atom_t *stco_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2674 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2675 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2676 /* chunk offsets atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2677 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2678 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 stco atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2679 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2680 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2681 stco_atom = (ngx_mp4_stco_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2682 ngx_mp4_set_atom_name(stco_atom, 's', 't', 'c', 'o'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2683 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2684 if (ngx_mp4_atom_data_size(ngx_mp4_stco_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2685 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2686 "\"%s\" mp4 stco atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2687 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2688 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2689 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2690 entries = ngx_mp4_get_32value(stco_atom->entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2691 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2692 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "chunks:%uD", entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2693 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2694 if (ngx_mp4_atom_data_size(ngx_mp4_stco_atom_t) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2695 + entries * sizeof(uint32_t) > atom_data_size) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2696 { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2697 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2698 "\"%s\" mp4 stco atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2699 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2700 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2701 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2702 atom_table = atom_header + sizeof(ngx_mp4_stco_atom_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2703 atom_end = atom_table + entries * sizeof(uint32_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2704 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2705 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2706 trak->chunks = entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2707 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2708 atom = &trak->stco_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2709 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2710 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2711 atom->last = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2712 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2713 data = &trak->stco_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2714 data->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2715 data->pos = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2716 data->last = atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2717 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2718 trak->out[NGX_HTTP_MP4_STCO_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2719 trak->out[NGX_HTTP_MP4_STCO_DATA].buf = data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2720 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2721 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2722 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2723 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2724 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2725 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2726 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2727 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2728 ngx_http_mp4_update_stco_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2729 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2730 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2731 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2732 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2733 ngx_mp4_stco_atom_t *stco_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2734 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2735 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2736 * mdia.minf.stbl.stco updating requires trak->start_chunk |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2737 * from mdia.minf.stbl.stsc which depends on value from mdia.mdhd |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2738 * atom which may reside after mdia.minf |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2739 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2740 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2741 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2742 "mp4 stco atom update"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2743 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2744 data = trak->out[NGX_HTTP_MP4_STCO_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2745 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2746 if (data == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2747 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2748 "no mp4 stco atoms were found in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2749 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2750 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2751 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2752 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2753 if (trak->start_chunk > trak->chunks) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2754 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2755 "start time is out mp4 stco chunks in \"%s\"", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2756 mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2757 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2758 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2759 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2760 data->pos += trak->start_chunk * sizeof(uint32_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2761 atom_size = sizeof(ngx_mp4_stco_atom_t) + (data->last - data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2762 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2763 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2764 trak->start_offset = ngx_mp4_get_32value(data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2765 trak->start_offset += trak->chunk_samples_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2766 ngx_mp4_set_32value(data->pos, trak->start_offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2767 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2768 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2769 "start chunk offset:%uD", trak->start_offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2770 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2771 atom = trak->out[NGX_HTTP_MP4_STCO_ATOM].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2772 stco_atom = (ngx_mp4_stco_atom_t *) atom->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2773 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2774 ngx_mp4_set_32value(stco_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2775 ngx_mp4_set_32value(stco_atom->entries, trak->chunks - trak->start_chunk); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2776 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2777 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2778 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2779 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2780 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2781 static void |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2782 ngx_http_mp4_adjust_stco_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2783 ngx_http_mp4_trak_t *trak, int32_t adjustment) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2784 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2785 uint32_t offset, *entry, *end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2786 ngx_buf_t *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2787 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2788 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2789 * moov.trak.mdia.minf.stbl.stco adjustment requires |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2790 * minimal start offset of all traks and new moov atom size |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2791 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2792 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2793 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2794 "mp4 stco atom adjustment"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2795 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2796 data = trak->out[NGX_HTTP_MP4_STCO_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2797 entry = (uint32_t *) data->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2798 end = (uint32_t *) data->last; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2799 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2800 while (entry < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2801 offset = ngx_mp4_get_32value(entry); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2802 offset += adjustment; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2803 ngx_mp4_set_32value(entry, offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2804 entry++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2805 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2806 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2807 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2808 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2809 typedef struct { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2810 u_char size[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2811 u_char name[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2812 u_char version[1]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2813 u_char flags[3]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2814 u_char entries[4]; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2815 } ngx_mp4_co64_atom_t; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2816 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2817 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2818 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2819 ngx_http_mp4_read_co64_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2820 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2821 u_char *atom_header, *atom_table, *atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2822 uint32_t entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2823 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2824 ngx_mp4_co64_atom_t *co64_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2825 ngx_http_mp4_trak_t *trak; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2826 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2827 /* chunk offsets atom */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2828 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2829 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 co64 atom"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2830 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2831 atom_header = ngx_mp4_atom_header(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2832 co64_atom = (ngx_mp4_co64_atom_t *) atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2833 ngx_mp4_set_atom_name(co64_atom, 'c', 'o', '6', '4'); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2834 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2835 if (ngx_mp4_atom_data_size(ngx_mp4_co64_atom_t) > atom_data_size) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2836 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2837 "\"%s\" mp4 co64 atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2838 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2839 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2840 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2841 entries = ngx_mp4_get_32value(co64_atom->entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2842 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2843 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "chunks:%uD", entries); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2844 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2845 if (ngx_mp4_atom_data_size(ngx_mp4_co64_atom_t) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2846 + entries * sizeof(uint64_t) > atom_data_size) |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2847 { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2848 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2849 "\"%s\" mp4 co64 atom too small", mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2850 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2851 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2852 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2853 atom_table = atom_header + sizeof(ngx_mp4_co64_atom_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2854 atom_end = atom_table + entries * sizeof(uint64_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2855 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2856 trak = ngx_mp4_last_trak(mp4); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2857 trak->chunks = entries; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2858 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2859 atom = &trak->co64_atom_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2860 atom->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2861 atom->pos = atom_header; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2862 atom->last = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2863 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2864 data = &trak->co64_data_buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2865 data->temporary = 1; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2866 data->pos = atom_table; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2867 data->last = atom_end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2868 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2869 trak->out[NGX_HTTP_MP4_CO64_ATOM].buf = atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2870 trak->out[NGX_HTTP_MP4_CO64_DATA].buf = data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2871 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2872 ngx_mp4_atom_next(mp4, atom_data_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2873 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2874 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2875 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2876 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2877 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2878 static ngx_int_t |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2879 ngx_http_mp4_update_co64_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2880 ngx_http_mp4_trak_t *trak) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2881 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2882 size_t atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2883 ngx_buf_t *atom, *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2884 ngx_mp4_co64_atom_t *co64_atom; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2885 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2886 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2887 * mdia.minf.stbl.co64 updating requires trak->start_chunk |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2888 * from mdia.minf.stbl.stsc which depends on value from mdia.mdhd |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2889 * atom which may reside after mdia.minf |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2890 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2891 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2892 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2893 "mp4 co64 atom update"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2894 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2895 data = trak->out[NGX_HTTP_MP4_CO64_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2896 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2897 if (data == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2898 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2899 "no mp4 co64 atoms were found in \"%s\"", |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2900 mp4->file.name.data); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2901 return NGX_ERROR; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2902 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2903 |
4589
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2904 if (trak->start_chunk > trak->chunks) { |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2905 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2906 "start time is out mp4 co64 chunks in \"%s\"", |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2907 mp4->file.name.data); |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2908 return NGX_ERROR; |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2909 } |
533aa09a783b
Merge of r4578, r4579, r4580, r4586: mp4 fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4450
diff
changeset
|
2910 |
4169
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2911 data->pos += trak->start_chunk * sizeof(uint64_t); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2912 atom_size = sizeof(ngx_mp4_co64_atom_t) + (data->last - data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2913 trak->size += atom_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2914 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2915 trak->start_offset = ngx_mp4_get_64value(data->pos); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2916 trak->start_offset += trak->chunk_samples_size; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2917 ngx_mp4_set_64value(data->pos, trak->start_offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2918 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2919 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2920 "start chunk offset:%uL", trak->start_offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2921 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2922 atom = trak->out[NGX_HTTP_MP4_CO64_ATOM].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2923 co64_atom = (ngx_mp4_co64_atom_t *) atom->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2924 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2925 ngx_mp4_set_32value(co64_atom->size, atom_size); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2926 ngx_mp4_set_32value(co64_atom->entries, trak->chunks - trak->start_chunk); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2927 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2928 return NGX_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2929 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2930 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2931 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2932 static void |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2933 ngx_http_mp4_adjust_co64_atom(ngx_http_mp4_file_t *mp4, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2934 ngx_http_mp4_trak_t *trak, off_t adjustment) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2935 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2936 uint64_t offset, *entry, *end; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2937 ngx_buf_t *data; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2938 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2939 /* |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2940 * moov.trak.mdia.minf.stbl.co64 adjustment requires |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2941 * minimal start offset of all traks and new moov atom size |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2942 */ |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2943 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2944 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2945 "mp4 co64 atom adjustment"); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2946 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2947 data = trak->out[NGX_HTTP_MP4_CO64_DATA].buf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2948 entry = (uint64_t *) data->pos; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2949 end = (uint64_t *) data->last; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2950 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2951 while (entry < end) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2952 offset = ngx_mp4_get_64value(entry); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2953 offset += adjustment; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2954 ngx_mp4_set_64value(entry, offset); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2955 entry++; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2956 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2957 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2958 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2959 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2960 static char * |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2961 ngx_http_mp4(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2962 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2963 ngx_http_core_loc_conf_t *clcf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2964 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2965 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2966 clcf->handler = ngx_http_mp4_handler; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2967 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2968 return NGX_CONF_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2969 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2970 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2971 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2972 static void * |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2973 ngx_http_mp4_create_conf(ngx_conf_t *cf) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2974 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2975 ngx_http_mp4_conf_t *conf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2976 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2977 conf = ngx_palloc(cf->pool, sizeof(ngx_http_mp4_conf_t)); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2978 if (conf == NULL) { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2979 return NULL; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2980 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2981 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2982 conf->buffer_size = NGX_CONF_UNSET_SIZE; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2983 conf->max_buffer_size = NGX_CONF_UNSET_SIZE; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2984 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2985 return conf; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2986 } |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2987 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2988 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2989 static char * |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2990 ngx_http_mp4_merge_conf(ngx_conf_t *cf, void *parent, void *child) |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2991 { |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2992 ngx_http_mp4_conf_t *prev = parent; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2993 ngx_http_mp4_conf_t *conf = child; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2994 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2995 ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size, 512 * 1024); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2996 ngx_conf_merge_size_value(conf->max_buffer_size, prev->max_buffer_size, |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2997 10 * 1024 * 1024); |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2998 |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
2999 return NGX_CONF_OK; |
432243531ce3
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100,
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
3000 } |