Mercurial > hg > nginx
comparison src/http/modules/ngx_http_mp4_module.c @ 4096:f9a1646b9611
Fix of debug message format.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 12 Sep 2011 15:15:00 +0000 |
parents | fbf665ffa171 |
children | a3e07fab98a3 |
comparison
equal
deleted
inserted
replaced
4095:fbf665ffa171 | 4096:f9a1646b9611 |
---|---|
1690 | 1690 |
1691 if (entries) { | 1691 if (entries) { |
1692 /* codecs of interest: avc1 (H.264), mp4a (MPEG-4 audio) */ | 1692 /* codecs of interest: avc1 (H.264), mp4a (MPEG-4 audio) */ |
1693 | 1693 |
1694 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | 1694 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
1695 "stsd entries:%ui, codec:%*s", | 1695 "stsd entries:%uD, codec:%*s", |
1696 entries, 4, | 1696 entries, 4, |
1697 atom_header + sizeof(ngx_mp4_stsd_atom_t) + 4); | 1697 atom_header + sizeof(ngx_mp4_stsd_atom_t) + 4); |
1698 | 1698 |
1699 } | 1699 } |
1700 } | 1700 } |
1748 ngx_mp4_set_atom_name(stts_atom, 's', 't', 't', 's'); | 1748 ngx_mp4_set_atom_name(stts_atom, 's', 't', 't', 's'); |
1749 | 1749 |
1750 entries = ngx_mp4_get_32value(stts_atom->entries); | 1750 entries = ngx_mp4_get_32value(stts_atom->entries); |
1751 | 1751 |
1752 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | 1752 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
1753 "mp4 time-to-sample entries:%ui", entries); | 1753 "mp4 time-to-sample entries:%uD", entries); |
1754 | 1754 |
1755 atom_table = atom_header + sizeof(ngx_mp4_stts_atom_t); | 1755 atom_table = atom_header + sizeof(ngx_mp4_stts_atom_t); |
1756 atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t); | 1756 atom_end = atom_table + entries * sizeof(ngx_mp4_stts_entry_t); |
1757 | 1757 |
1758 if ((uint64_t) (atom_end - stts_atom->version) > atom_data_size) { | 1758 if ((uint64_t) (atom_end - stts_atom->version) > atom_data_size) { |
1815 | 1815 |
1816 entries = trak->time_to_sample_entries; | 1816 entries = trak->time_to_sample_entries; |
1817 start_time = mp4->start * trak->timescale / 1000; | 1817 start_time = mp4->start * trak->timescale / 1000; |
1818 | 1818 |
1819 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | 1819 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
1820 "time-to-sample start_time:%ui", start_time); | 1820 "time-to-sample start_time:%uL", start_time); |
1821 | 1821 |
1822 start_sample = 0; | 1822 start_sample = 0; |
1823 entry = (ngx_mp4_stts_entry_t *) data->pos; | 1823 entry = (ngx_mp4_stts_entry_t *) data->pos; |
1824 end = (ngx_mp4_stts_entry_t *) data->last; | 1824 end = (ngx_mp4_stts_entry_t *) data->last; |
1825 | 1825 |
1896 ngx_mp4_set_atom_name(stss_atom, 's', 't', 's', 's'); | 1896 ngx_mp4_set_atom_name(stss_atom, 's', 't', 's', 's'); |
1897 | 1897 |
1898 entries = ngx_mp4_get_32value(stss_atom->entries); | 1898 entries = ngx_mp4_get_32value(stss_atom->entries); |
1899 | 1899 |
1900 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | 1900 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
1901 "sync sample entries:%ui", entries); | 1901 "sync sample entries:%uD", entries); |
1902 | 1902 |
1903 trak = ngx_mp4_last_trak(mp4); | 1903 trak = ngx_mp4_last_trak(mp4); |
1904 trak->sync_samples_entries = entries; | 1904 trak->sync_samples_entries = entries; |
1905 | 1905 |
1906 atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t); | 1906 atom_table = atom_header + sizeof(ngx_http_mp4_stss_atom_t); |
2041 ngx_mp4_set_atom_name(ctts_atom, 'c', 't', 't', 's'); | 2041 ngx_mp4_set_atom_name(ctts_atom, 'c', 't', 't', 's'); |
2042 | 2042 |
2043 entries = ngx_mp4_get_32value(ctts_atom->entries); | 2043 entries = ngx_mp4_get_32value(ctts_atom->entries); |
2044 | 2044 |
2045 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | 2045 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
2046 "composition offset entries:%ui", entries); | 2046 "composition offset entries:%uD", entries); |
2047 | 2047 |
2048 trak = ngx_mp4_last_trak(mp4); | 2048 trak = ngx_mp4_last_trak(mp4); |
2049 trak->composition_offset_entries = entries; | 2049 trak->composition_offset_entries = entries; |
2050 | 2050 |
2051 atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t); | 2051 atom_table = atom_header + sizeof(ngx_mp4_ctts_atom_t); |
2180 ngx_mp4_set_atom_name(stsc_atom, 's', 't', 's', 'c'); | 2180 ngx_mp4_set_atom_name(stsc_atom, 's', 't', 's', 'c'); |
2181 | 2181 |
2182 entries = ngx_mp4_get_32value(stsc_atom->entries); | 2182 entries = ngx_mp4_get_32value(stsc_atom->entries); |
2183 | 2183 |
2184 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | 2184 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
2185 "sample-to-chunk entries:%ui", entries); | 2185 "sample-to-chunk entries:%uD", entries); |
2186 | 2186 |
2187 atom_table = atom_header + sizeof(ngx_mp4_stsc_atom_t); | 2187 atom_table = atom_header + sizeof(ngx_mp4_stsc_atom_t); |
2188 atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t); | 2188 atom_end = atom_table + entries * sizeof(ngx_mp4_stsc_entry_t); |
2189 | 2189 |
2190 if ((uint64_t) (atom_end - stsc_atom->version) > atom_data_size) { | 2190 if ((uint64_t) (atom_end - stsc_atom->version) > atom_data_size) { |