osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

mp4: improve Sample Size Box (stsz) dissection 

* Describe what sample size == 0 means.
* Show an index next to each table entry.
* Table indices start from 1 according to the specification.

Change-Id: I106188051e6618c3b85fa4945facfe4fedd1987b
Reviewed-on: https://code.wireshark.org/review/35937
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Jakub Adam 2020-01-20 17:56:05 +01:00 committed by Anders Broman
parent d2dcb9ee7b
commit 3351effd06
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/file-mp4.c
View File

@ -429,8 +429,9 @@ dissect_mp4_stsz_body(tvbuff_t *tvb, gint offset, gint len _U_,
sample_size = tvb_get_ntohl(tvb, offset);
proto_tree_add_item(tree, hf_mp4_stsz_sample_size,
tvb, offset, 4, ENC_BIG_ENDIAN);
proto_tree_add_uint_format(tree, hf_mp4_stsz_sample_size,
tvb, offset, 4, sample_size, "Sample size: %u%s", sample_size,
sample_size == 0 ? " (samples have different sizes)" : "");
/* XXX - expert info for sample size == 0 */
offset += 4;
@ -442,9 +443,13 @@ dissect_mp4_stsz_body(tvbuff_t *tvb, gint offset, gint len _U_,
if (sample_size != 0)
return offset - offset_start;
for (i=0; i<sample_count; i++) {
proto_tree_add_item(tree, hf_mp4_stsz_entry_size,
tvb, offset, 4, ENC_BIG_ENDIAN);
for (i=1; i<=sample_count; i++) {
guint32 entry_size;
entry_size = tvb_get_ntohl(tvb, offset);
proto_tree_add_uint_format(tree, hf_mp4_stsz_entry_size,
tvb, offset, 4, entry_size, "Entry %u: Entry size: %u", i,
entry_size);
offset += 4;
}