summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/menus/main_menu.c2
-rw-r--r--apps/metadata/id3tags.c12
-rw-r--r--apps/metadata/metadata_common.c5
-rw-r--r--apps/metadata/mp4.c31
-rw-r--r--apps/plugins/SOURCES2
-rw-r--r--apps/plugins/test_codec.c3
-rw-r--r--apps/screens.c2
-rw-r--r--apps/talk.c12
-rw-r--r--apps/talk.h3
9 files changed, 36 insertions, 36 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 902e14b819..6ee7ba4156 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -303,7 +303,7 @@ static int info_speak_item(int selected_item, void * data)
303 { 303 {
304 talk_id(LANG_BATTERY_TIME, false); 304 talk_id(LANG_BATTERY_TIME, false);
305 talk_value(battery_level(), UNIT_PERCENT, true); 305 talk_value(battery_level(), UNIT_PERCENT, true);
306 talk_value(battery_time() *60, UNIT_TIME_EXACT, true); 306 talk_value(battery_time() *60, UNIT_TIME, true);
307 } 307 }
308 else talk_id(VOICE_BLANK, false); 308 else talk_id(VOICE_BLANK, false);
309 break; 309 break;
diff --git a/apps/metadata/id3tags.c b/apps/metadata/id3tags.c
index 9ee183a1b3..9143f8ad25 100644
--- a/apps/metadata/id3tags.c
+++ b/apps/metadata/id3tags.c
@@ -358,8 +358,7 @@ static int parseuser( struct mp3entry* entry, char* tag, int bufferpos )
358 358
359 if ((tag - entry->id3v2buf + desc_len + 2) < bufferpos) { 359 if ((tag - entry->id3v2buf + desc_len + 2) < bufferpos) {
360 /* At least part of the value was read, so we can safely try to 360 /* At least part of the value was read, so we can safely try to
361 * parse it 361 * parse it */
362 */
363 value = tag + desc_len + 1; 362 value = tag + desc_len + 1;
364 value_len = bufferpos - (tag - entry->id3v2buf); 363 value_len = bufferpos - (tag - entry->id3v2buf);
365 364
@@ -368,8 +367,7 @@ static int parseuser( struct mp3entry* entry, char* tag, int bufferpos )
368 entry->albumartist = tag; 367 entry->albumartist = tag;
369#if CONFIG_CODEC == SWCODEC 368#if CONFIG_CODEC == SWCODEC
370 } else { 369 } else {
371 value_len = parse_replaygain(tag, value, entry, tag, 370 value_len = parse_replaygain(tag, value, entry, tag, value_len);
372 value_len);
373#endif 371#endif
374 } 372 }
375 } 373 }
@@ -1040,6 +1038,12 @@ void setid3v2title(int fd, struct mp3entry *entry)
1040#endif 1038#endif
1041 if( tr->ppFunc ) 1039 if( tr->ppFunc )
1042 bufferpos = tr->ppFunc(entry, tag, bufferpos); 1040 bufferpos = tr->ppFunc(entry, tag, bufferpos);
1041
1042 /* Trim. Take into account that multiple string contents will
1043 * only be displayed up to their first null termination. All
1044 * content after this null termination is obsolete and can be
1045 * overwritten. */
1046 bufferpos -= (bytesread - strlen(tag));
1043 1047
1044 /* Seek to the next frame */ 1048 /* Seek to the next frame */
1045 if(framelen < totframelen) 1049 if(framelen < totframelen)
diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c
index e1ef9a0d62..4f001775f3 100644
--- a/apps/metadata/metadata_common.c
+++ b/apps/metadata/metadata_common.c
@@ -337,7 +337,10 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3,
337 p = NULL; 337 p = NULL;
338 } 338 }
339 339
340 if (p) 340 /* Do not overwrite already available metadata. Especially when reading
341 * tags with e.g. multiple genres / artists. This way only the first
342 * of multiple entries is used, all following are dropped. */
343 if (p!=NULL && *p==NULL)
341 { 344 {
342 len = strlen(value); 345 len = strlen(value);
343 len = MIN(len, buf_remaining - 1); 346 len = MIN(len, buf_remaining - 1);
diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c
index 1ef3701e30..26ab7cc30a 100644
--- a/apps/metadata/mp4.c
+++ b/apps/metadata/mp4.c
@@ -73,9 +73,6 @@
73#define MP4_udta FOURCC('u', 'd', 't', 'a') 73#define MP4_udta FOURCC('u', 'd', 't', 'a')
74#define MP4_extra FOURCC('-', '-', '-', '-') 74#define MP4_extra FOURCC('-', '-', '-', '-')
75 75
76/* Used to correct id3->samples, if SBR upsampling was detected in esds atom. */
77static bool SBR_upsampling_used = false;
78
79/* Read the tag data from an MP4 file, storing up to buffer_size bytes in 76/* Read the tag data from an MP4 file, storing up to buffer_size bytes in
80 * buffer. 77 * buffer.
81 */ 78 */
@@ -120,11 +117,17 @@ static unsigned int read_mp4_tag_string(int fd, int size_left, char** buffer,
120 117
121 if (bytes_read) 118 if (bytes_read)
122 { 119 {
123 (*buffer)[bytes_read] = 0; 120 /* Do not overwrite already available metadata. Especially when reading
124 *dest = *buffer; 121 * tags with e.g. multiple genres / artists. This way only the first
125 length = strlen(*buffer) + 1; 122 * of multiple entries is used, all following are dropped. */
126 *buffer_left -= length; 123 if (*dest == NULL)
127 *buffer += length; 124 {
125 (*buffer)[bytes_read] = 0;
126 *dest = *buffer;
127 length = strlen(*buffer) + 1;
128 *buffer_left -= length;
129 *buffer += length;
130 }
128 } 131 }
129 else 132 else
130 { 133 {
@@ -343,11 +346,6 @@ static bool read_mp4_esds(int fd, struct mp3entry* id3, uint32_t* size)
343 * decoding (parts of) the file. 346 * decoding (parts of) the file.
344 */ 347 */
345 id3->frequency *= 2; 348 id3->frequency *= 2;
346
347 /* Set this to true to be able to calculate the correct runtime
348 * and bitrate. */
349 SBR_upsampling_used = true;
350
351 sbr = true; 349 sbr = true;
352 } 350 }
353 } 351 }
@@ -640,7 +638,7 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
640 unsigned int i; 638 unsigned int i;
641 639
642 /* Reset to false. */ 640 /* Reset to false. */
643 id3->needs_upsampling_correction = true; 641 id3->needs_upsampling_correction = false;
644 642
645 lseek(fd, 4, SEEK_CUR); 643 lseek(fd, 4, SEEK_CUR);
646 read_uint32be(fd, &entries); 644 read_uint32be(fd, &entries);
@@ -654,12 +652,12 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
654 read_uint32be(fd, &n); 652 read_uint32be(fd, &n);
655 read_uint32be(fd, &l); 653 read_uint32be(fd, &l);
656 654
657 /* Some SBR files use upsampling. In this case the number 655 /* Some AAC file use HE profile. In this case the number
658 * of output samples is doubled to a maximum of 2048 656 * of output samples is doubled to a maximum of 2048
659 * samples per frame. This means that files which already 657 * samples per frame. This means that files which already
660 * report a frame size of 2048 in their header will not 658 * report a frame size of 2048 in their header will not
661 * need any further special handling. */ 659 * need any further special handling. */
662 if (SBR_upsampling_used && l<=1024) 660 if (id3->codectype==AFMT_MP4_AAC_HE && l<=1024)
663 { 661 {
664 id3->samples += n * l * 2; 662 id3->samples += n * l * 2;
665 id3->needs_upsampling_correction = true; 663 id3->needs_upsampling_correction = true;
@@ -774,7 +772,6 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
774 772
775bool get_mp4_metadata(int fd, struct mp3entry* id3) 773bool get_mp4_metadata(int fd, struct mp3entry* id3)
776{ 774{
777 SBR_upsampling_used = false;
778 id3->codectype = AFMT_UNKNOWN; 775 id3->codectype = AFMT_UNKNOWN;
779 id3->filesize = 0; 776 id3->filesize = 0;
780 errno = 0; 777 errno = 0;
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 7afd97309f..4d7434d771 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -217,7 +217,7 @@ superdom.c
217 217
218 218
219 219
220#ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */ 220#if 1//#ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */
221#ifdef HAVE_ADJUSTABLE_CPU_FREQ 221#ifdef HAVE_ADJUSTABLE_CPU_FREQ
222test_boost.c 222test_boost.c
223#endif 223#endif
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c
index 9b00fdbb95..56aedda1c8 100644
--- a/apps/plugins/test_codec.c
+++ b/apps/plugins/test_codec.c
@@ -883,8 +883,7 @@ menu:
883 boost_settings, 2, NULL); 883 boost_settings, 2, NULL);
884 goto menu; 884 goto menu;
885 } 885 }
886 if(boost) 886 rb->cpu_boost(boost ? true: false);
887 rb->cpu_boost(true);
888#endif 887#endif
889 888
890 if (result == QUIT) 889 if (result == QUIT)
diff --git a/apps/screens.c b/apps/screens.c
index a11c4333ea..81472e6cc7 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -805,7 +805,7 @@ static int runtime_speak_data(int selected_item, void* data)
805 talk_ids(false, 805 talk_ids(false,
806 (selected_item < 2) ? LANG_RUNNING_TIME : LANG_TOP_TIME, 806 (selected_item < 2) ? LANG_RUNNING_TIME : LANG_TOP_TIME,
807 TALK_ID((selected_item < 2) ? global_status.runtime 807 TALK_ID((selected_item < 2) ? global_status.runtime
808 : global_status.topruntime, UNIT_TIME_EXACT)); 808 : global_status.topruntime, UNIT_TIME));
809 return 0; 809 return 0;
810} 810}
811 811
diff --git a/apps/talk.c b/apps/talk.c
index 5fddf85986..8c0f1f3a07 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -1015,7 +1015,7 @@ int talk_number(long n, bool enqueue)
1015 1015
1016/* Say time duration/interval. Input is time in seconds, 1016/* Say time duration/interval. Input is time in seconds,
1017 say hours,minutes,seconds. */ 1017 say hours,minutes,seconds. */
1018static int talk_time_unit(long secs, bool exact, bool enqueue) 1018static int talk_time_unit(long secs, bool enqueue)
1019{ 1019{
1020 int hours, mins; 1020 int hours, mins;
1021 if (!enqueue) 1021 if (!enqueue)
@@ -1026,11 +1026,9 @@ static int talk_time_unit(long secs, bool exact, bool enqueue)
1026 } 1026 }
1027 if((mins = secs/60)) { 1027 if((mins = secs/60)) {
1028 secs %= 60; 1028 secs %= 60;
1029 if(exact || !hours) 1029 talk_value(mins, UNIT_MIN, true);
1030 talk_value(mins, UNIT_MIN, true);
1031 else talk_number(mins, true); /* don't say "minutes" */
1032 } 1030 }
1033 if((exact && secs) || (!hours && !mins)) 1031 if((secs) || (!hours && !mins))
1034 talk_value(secs, UNIT_SEC, true); 1032 talk_value(secs, UNIT_SEC, true);
1035 else if(!hours && secs) 1033 else if(!hours && secs)
1036 talk_number(secs, true); 1034 talk_number(secs, true);
@@ -1110,8 +1108,8 @@ int talk_value_decimal(long n, int unit, int decimals, bool enqueue)
1110#endif 1108#endif
1111 1109
1112 /* special case for time duration */ 1110 /* special case for time duration */
1113 if (unit == UNIT_TIME || unit == UNIT_TIME_EXACT) 1111 if (unit == UNIT_TIME)
1114 return talk_time_unit(n, unit == UNIT_TIME_EXACT, enqueue); 1112 return talk_time_unit(n, enqueue);
1115 1113
1116 if (unit < 0 || unit >= UNIT_LAST) 1114 if (unit < 0 || unit >= UNIT_LAST)
1117 unit_id = -1; 1115 unit_id = -1;
diff --git a/apps/talk.h b/apps/talk.h
index fc1bfe5a2d..a2a9f44e4e 100644
--- a/apps/talk.h
+++ b/apps/talk.h
@@ -50,8 +50,7 @@ enum {
50 UNIT_MB, /* Megabytes */ 50 UNIT_MB, /* Megabytes */
51 UNIT_KBIT, /* kilobits per sec */ 51 UNIT_KBIT, /* kilobits per sec */
52 UNIT_PM_TICK, /* peak meter units per tick */ 52 UNIT_PM_TICK, /* peak meter units per tick */
53 UNIT_TIME_EXACT,/* time duration/interval in seconds, says hours,mins,secs*/ 53 UNIT_TIME, /* time duration/interval in seconds, says hours,mins,secs */
54 UNIT_TIME, /* as above but less verbose */
55 UNIT_LAST /* END MARKER */ 54 UNIT_LAST /* END MARKER */
56}; 55};
57 56