summaryrefslogtreecommitdiff
path: root/apps/codecs/libasf/asf.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/codecs/libasf/asf.c')
-rw-r--r--apps/codecs/libasf/asf.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/apps/codecs/libasf/asf.c b/apps/codecs/libasf/asf.c
index a7e4bca307..4e3235a422 100644
--- a/apps/codecs/libasf/asf.c
+++ b/apps/codecs/libasf/asf.c
@@ -59,16 +59,18 @@ int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength,
59 uint8_t* datap; 59 uint8_t* datap;
60 uint32_t length; 60 uint32_t length;
61 uint32_t padding_length; 61 uint32_t padding_length;
62 /* rockbox: comment 'set but unused' variables
62 uint32_t send_time; 63 uint32_t send_time;
63 uint16_t duration; 64 uint16_t duration;
65 uint32_t media_object_number;
66 uint32_t media_object_offset;
67 */
64 uint16_t payload_count; 68 uint16_t payload_count;
65 int payload_length_type; 69 int payload_length_type;
66 uint32_t payload_hdrlen; 70 uint32_t payload_hdrlen;
67 int payload_datalen; 71 int payload_datalen;
68 int multiple; 72 int multiple;
69 uint32_t replicated_length; 73 uint32_t replicated_length;
70 uint32_t media_object_number;
71 uint32_t media_object_offset;
72 uint32_t bytesread = 0; 74 uint32_t bytesread = 0;
73 uint8_t* buf; 75 uint8_t* buf;
74 size_t bufsize; 76 size_t bufsize;
@@ -133,9 +135,9 @@ int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength,
133 datap += GETLEN2b((packet_flags >> 1) & 0x03); 135 datap += GETLEN2b((packet_flags >> 1) & 0x03);
134 padding_length = GETVALUE2b((packet_flags >> 3) & 0x03, datap); 136 padding_length = GETVALUE2b((packet_flags >> 3) & 0x03, datap);
135 datap += GETLEN2b((packet_flags >> 3) & 0x03); 137 datap += GETLEN2b((packet_flags >> 3) & 0x03);
136 send_time = get_long_le(datap); 138 /* send_time = get_long_le(datap); */
137 datap += 4; 139 datap += 4;
138 duration = get_short_le(datap); 140 /* duration = get_short_le(datap); */
139 datap += 2; 141 datap += 2;
140 /*DEBUGF("and duration %d ms\n", duration);*/ 142 /*DEBUGF("and duration %d ms\n", duration);*/
141 143
@@ -225,9 +227,9 @@ int asf_read_packet(uint8_t** audiobuf, int* audiobufsize, int* packetlength,
225 } 227 }
226 228
227 bytesread += payload_hdrlen; 229 bytesread += payload_hdrlen;
228 media_object_number = GETVALUE2b((packet_property >> 4) & 0x03, datap); 230 /* media_object_number = GETVALUE2b((packet_property >> 4) & 0x03, datap); */
229 datap += GETLEN2b((packet_property >> 4) & 0x03); 231 datap += GETLEN2b((packet_property >> 4) & 0x03);
230 media_object_offset = GETVALUE2b((packet_property >> 2) & 0x03, datap); 232 /* media_object_offset = GETVALUE2b((packet_property >> 2) & 0x03, datap); */
231 datap += GETLEN2b((packet_property >> 2) & 0x03); 233 datap += GETLEN2b((packet_property >> 2) & 0x03);
232 replicated_length = GETVALUE2b(packet_property & 0x03, datap); 234 replicated_length = GETVALUE2b(packet_property & 0x03, datap);
233 datap += GETLEN2b(packet_property & 0x03); 235 datap += GETLEN2b(packet_property & 0x03);
@@ -299,8 +301,10 @@ int asf_get_timestamp(int *duration)
299 int datalen; 301 int datalen;
300 uint8_t data[18]; 302 uint8_t data[18];
301 uint8_t* datap; 303 uint8_t* datap;
304 /* rockbox: comment 'set but unused' variables
302 uint32_t length; 305 uint32_t length;
303 uint32_t padding_length; 306 uint32_t padding_length;
307 */
304 uint32_t send_time; 308 uint32_t send_time;
305 static int packet_count = 0; 309 static int packet_count = 0;
306 310
@@ -359,13 +363,13 @@ int asf_get_timestamp(int *duration)
359 bytesread += datalen; 363 bytesread += datalen;
360 364
361 datap = data; 365 datap = data;
362 length = GETVALUE2b((packet_flags >> 5) & 0x03, datap); 366 /* length = GETVALUE2b((packet_flags >> 5) & 0x03, datap); */
363 datap += GETLEN2b((packet_flags >> 5) & 0x03); 367 datap += GETLEN2b((packet_flags >> 5) & 0x03);
364 368
365 /* sequence value is not used */ 369 /* sequence value is not used */
366 GETVALUE2b((packet_flags >> 1) & 0x03, datap); 370 GETVALUE2b((packet_flags >> 1) & 0x03, datap);
367 datap += GETLEN2b((packet_flags >> 1) & 0x03); 371 datap += GETLEN2b((packet_flags >> 1) & 0x03);
368 padding_length = GETVALUE2b((packet_flags >> 3) & 0x03, datap); 372 /* padding_length = GETVALUE2b((packet_flags >> 3) & 0x03, datap); */
369 datap += GETLEN2b((packet_flags >> 3) & 0x03); 373 datap += GETLEN2b((packet_flags >> 3) & 0x03);
370 send_time = get_long_le(datap); 374 send_time = get_long_le(datap);
371 datap += 4; 375 datap += 4;