Mercurial > hg > nginx

comparison src/http/modules/ngx_http_mp4_module.c @ 6478:3ef7bb882ad4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed logging with variable field width.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 31 Mar 2016 02:33:53 +0300
parents 2cd019520210
children 293413010217
comparison
equal deleted inserted replaced
6477:47daf95d0138 6478:3ef7bb882ad4
911 atom_header = mp4->buffer_pos; 911 atom_header = mp4->buffer_pos;
912 atom_name = atom_header + sizeof(uint32_t); 912 atom_name = atom_header + sizeof(uint32_t);
913 913
914 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, 914 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
915 "mp4 atom: %*s @%O:%uL", 915 "mp4 atom: %*s @%O:%uL",
916 4, atom_name, mp4->offset, atom_size); 916 (size_t) 4, atom_name, mp4->offset, atom_size);
917 917
918 if (atom_size > (uint64_t) (NGX_MAX_OFF_T_VALUE - mp4->offset) 918 if (atom_size > (uint64_t) (NGX_MAX_OFF_T_VALUE - mp4->offset)
919 || mp4->offset + (off_t) atom_size > end) 919 || mp4->offset + (off_t) atom_size > end)
920 { 920 {
921 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0, 921 ngx_log_error(NGX_LOG_ERR, mp4->file.log, 0,
1956 } 1956 }
1957 1957
1958 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, 1958 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
1959 "stsd entries:%uD, media:%*s", 1959 "stsd entries:%uD, media:%*s",
1960 ngx_mp4_get_32value(stsd_atom->entries), 1960 ngx_mp4_get_32value(stsd_atom->entries),
1961 4, stsd_atom->media_name); 1961 (size_t) 4, stsd_atom->media_name);
1962 1962
1963 trak = ngx_mp4_last_trak(mp4); 1963 trak = ngx_mp4_last_trak(mp4);
1964 1964
1965 atom = &trak->stsd_atom_buf; 1965 atom = &trak->stsd_atom_buf;
1966 atom->temporary = 1; 1966 atom->temporary = 1;