Browse Source

Add column parameter to ts_hex_dump

Georgi Chorbadzhiyski 13 years ago
parent
commit
5eacf80cd8
4 changed files with 9 additions and 9 deletions
  1. 1
    1
      tsfuncs.h
  2. 3
    3
      tsfuncs_descriptors.c
  3. 3
    3
      tsfuncs_misc.c
  4. 2
    2
      tsfuncs_pes.c

+ 1
- 1
tsfuncs.h View File

246
 int				dec2bcd						(int dec);
246
 int				dec2bcd						(int dec);
247
 int				bcd2dec						(int bcd);
247
 int				bcd2dec						(int bcd);
248
 void			ts_compare_data   			(char *prefix, uint8_t *a, uint8_t *b, int size);
248
 void			ts_compare_data   			(char *prefix, uint8_t *a, uint8_t *b, int size);
249
-char *			ts_hex_dump      			(uint8_t *d, int size);
249
+char *			ts_hex_dump      			(uint8_t *d, int size, int col);
250
 void			ts_print_bytes				(char *prefix, uint8_t *d, int size);
250
 void			ts_print_bytes				(char *prefix, uint8_t *d, int size);
251
 char *			init_dvb_string_utf8		(char *text);
251
 char *			init_dvb_string_utf8		(char *text);
252
 char *			init_dvb_string_iso_8859_5	(char *text);
252
 char *			init_dvb_string_iso_8859_5	(char *text);

+ 3
- 3
tsfuncs_descriptors.c View File

48
 
48
 
49
 		switch (tag) {
49
 		switch (tag) {
50
 			case  2: { // Video stream descriptor
50
 			case  2: { // Video stream descriptor
51
-				char *dump = ts_hex_dump(data, this_length);
51
+				char *dump = ts_hex_dump(data, this_length, 0);
52
 				ts_LOGf("%sTag 0x%02x (%02d), sz: %d, Video stream descriptor: %s\n", pad, tag, tag, this_length, dump);
52
 				ts_LOGf("%sTag 0x%02x (%02d), sz: %d, Video stream descriptor: %s\n", pad, tag, tag, this_length, dump);
53
 				free(dump);
53
 				free(dump);
54
 				struct {
54
 				struct {
120
 				break;
120
 				break;
121
 			}
121
 			}
122
 			case  3: { // Audio stream descriptor
122
 			case  3: { // Audio stream descriptor
123
-				char *dump = ts_hex_dump(data, this_length);
123
+				char *dump = ts_hex_dump(data, this_length, 0);
124
 				ts_LOGf("%sTag 0x%02x (%02d), sz: %d, Audio stream descriptor: %s\n", pad, tag, tag, this_length, dump);
124
 				ts_LOGf("%sTag 0x%02x (%02d), sz: %d, Audio stream descriptor: %s\n", pad, tag, tag, this_length, dump);
125
 				free(dump);
125
 				free(dump);
126
 				struct {
126
 				struct {
475
 			}
475
 			}
476
 */
476
 */
477
 			default: {
477
 			default: {
478
-				char *dump = ts_hex_dump(data, this_length);
478
+				char *dump = ts_hex_dump(data, this_length, 0);
479
 				ts_LOGf("%s*** Unknown Tag 0x%02x (%02d), sz: %d, data: %s\n", pad, tag, tag, this_length, dump);
479
 				ts_LOGf("%s*** Unknown Tag 0x%02x (%02d), sz: %d, data: %s\n", pad, tag, tag, this_length, dump);
480
 				free(dump);
480
 				free(dump);
481
 				break;
481
 				break;

+ 3
- 3
tsfuncs_misc.c View File

15
 	return ((bcd>>4) * 10) + bcd % 16;
15
 	return ((bcd>>4) * 10) + bcd % 16;
16
 }
16
 }
17
 
17
 
18
-char *ts_hex_dump(uint8_t *d, int size) {
18
+char *ts_hex_dump(uint8_t *d, int size, int col) {
19
 	int i;
19
 	int i;
20
 	char *buf = calloc(1, size * 6);
20
 	char *buf = calloc(1, size * 6);
21
 	if (!buf)
21
 	if (!buf)
22
 		return NULL;
22
 		return NULL;
23
 	for (i=0;i<size;i++) {
23
 	for (i=0;i<size;i++) {
24
-		if (size > 188 && (i % 16 == 15))
24
+		if (col && (i % col == col - 1))
25
 			sprintf(buf+(i*3), "%02x\n", d[i]);
25
 			sprintf(buf+(i*3), "%02x\n", d[i]);
26
 		else
26
 		else
27
 			sprintf(buf+(i*3), "%02x ", d[i]);
27
 			sprintf(buf+(i*3), "%02x ", d[i]);
30
 }
30
 }
31
 
31
 
32
 void ts_print_bytes(char *prefix, uint8_t *d, int size) {
32
 void ts_print_bytes(char *prefix, uint8_t *d, int size) {
33
-	char *buf = ts_hex_dump(d, size);
33
+	char *buf = ts_hex_dump(d, size, 0);
34
 	ts_LOGf("%s -> %s\n", prefix, buf);
34
 	ts_LOGf("%s -> %s\n", prefix, buf);
35
 	free(buf);
35
 	free(buf);
36
 }
36
 }

+ 2
- 2
tsfuncs_pes.c View File

540
 		pes->es_data_size
540
 		pes->es_data_size
541
 	);
541
 	);
542
 
542
 
543
-	char *phex = ts_hex_dump(pes->pes_data, min(32, pes->pes_data_pos));
543
+	char *phex = ts_hex_dump(pes->pes_data, min(32, pes->pes_data_pos), 0);
544
 	ts_LOGf("  - PES dump   : %s...\n", phex);
544
 	ts_LOGf("  - PES dump   : %s...\n", phex);
545
 	free(phex);
545
 	free(phex);
546
 
546
 
547
 	if (pes->es_data) {
547
 	if (pes->es_data) {
548
-		char *hex = ts_hex_dump(pes->es_data, min(32, pes->es_data_size));
548
+		char *hex = ts_hex_dump(pes->es_data, min(32, pes->es_data_size), 0);
549
 		ts_LOGf("  - ES dump    : %s...\n", hex);
549
 		ts_LOGf("  - ES dump    : %s...\n", hex);
550
 		free(hex);
550
 		free(hex);
551
 	}
551
 	}

Loading…
Cancel
Save