diff options
-rw-r--r-- | apps/recorder/peakmeter.c | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index 22f90a3f94..ae143c306f 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -67,6 +67,10 @@ static unsigned short db_min = 0; | |||
67 | static unsigned short db_max = 9000; | 67 | static unsigned short db_max = 9000; |
68 | static unsigned short db_range = 9000; | 68 | static unsigned short db_range = 9000; |
69 | 69 | ||
70 | #if CONFIG_HWCODEC == MASNONE | ||
71 | #define MAS_REG_DQPEAK_L 0 | ||
72 | #define MAS_REG_DQPEAK_R 0 | ||
73 | #endif | ||
70 | 74 | ||
71 | #ifndef SIMULATOR | 75 | #ifndef SIMULATOR |
72 | static int peak_meter_src_l = MAS_REG_DQPEAK_L; | 76 | static int peak_meter_src_l = MAS_REG_DQPEAK_L; |
@@ -453,7 +457,8 @@ void peak_meter_set_use_dbfs(int use){ | |||
453 | * Pass a value dBfs * 100 when dbfs is set to true. | 457 | * Pass a value dBfs * 100 when dbfs is set to true. |
454 | * Pass a percent value when dbfs is set to false. | 458 | * Pass a percent value when dbfs is set to false. |
455 | */ | 459 | */ |
456 | void peak_meter_init_range( bool dbfs, int range_min, int range_max) { | 460 | void peak_meter_init_range( bool dbfs, int range_min, int range_max) |
461 | { | ||
457 | peak_meter_use_dbfs = dbfs; | 462 | peak_meter_use_dbfs = dbfs; |
458 | peak_meter_set_min(range_min); | 463 | peak_meter_set_min(range_min); |
459 | peak_meter_set_max(range_max); | 464 | peak_meter_set_max(range_max); |
@@ -482,9 +487,12 @@ void peak_meter_init_times(int release, int hold, int clip_hold) { | |||
482 | * @param: bool playback - If true playback peak meter is used. | 487 | * @param: bool playback - If true playback peak meter is used. |
483 | * If false recording peak meter is used. | 488 | * If false recording peak meter is used. |
484 | */ | 489 | */ |
485 | void peak_meter_playback(bool playback) { | 490 | void peak_meter_playback(bool playback) |
491 | { | ||
486 | #ifdef SIMULATOR | 492 | #ifdef SIMULATOR |
487 | (void)playback; | 493 | (void)playback; |
494 | #elif CONFIG_HWCODEC == MASNONE | ||
495 | /* FIX: not for the sw-based ones yes */ | ||
488 | #else | 496 | #else |
489 | if (playback) { | 497 | if (playback) { |
490 | peak_meter_src_l = MAS_REG_DQPEAK_L; | 498 | peak_meter_src_l = MAS_REG_DQPEAK_L; |
@@ -503,10 +511,15 @@ void peak_meter_playback(bool playback) { | |||
503 | * that ocurred. This function could be used by a thread for | 511 | * that ocurred. This function could be used by a thread for |
504 | * busy reading the MAS. | 512 | * busy reading the MAS. |
505 | */ | 513 | */ |
506 | inline void peak_meter_peek(void) { | 514 | inline void peak_meter_peek(void) |
515 | { | ||
507 | #ifdef SIMULATOR | 516 | #ifdef SIMULATOR |
508 | int left = 8000; | 517 | int left = 8000; |
509 | int right = 9000; | 518 | int right = 9000; |
519 | #elif CONFIG_HWCODEC == MASNONE | ||
520 | /* FIX */ | ||
521 | int left = 9000; | ||
522 | int right = 8000; | ||
510 | #else | 523 | #else |
511 | /* read the peak values */ | 524 | /* read the peak values */ |
512 | int left = mas_codec_readreg(peak_meter_src_l); | 525 | int left = mas_codec_readreg(peak_meter_src_l); |
@@ -582,7 +595,8 @@ void peak_meter_init(void) { | |||
582 | * since the last call of peak_meter_read_l. The value | 595 | * since the last call of peak_meter_read_l. The value |
583 | * is in the range 0 <= value < MAX_PEAK. | 596 | * is in the range 0 <= value < MAX_PEAK. |
584 | */ | 597 | */ |
585 | static int peak_meter_read_l (void) { | 598 | static int peak_meter_read_l (void) |
599 | { | ||
586 | /* peak_meter_l contains the maximum of | 600 | /* peak_meter_l contains the maximum of |
587 | all peak values that were read by peak_meter_peek | 601 | all peak values that were read by peak_meter_peek |
588 | since the last call of peak_meter_read_r */ | 602 | since the last call of peak_meter_read_r */ |
@@ -593,6 +607,9 @@ static int peak_meter_read_l (void) { | |||
593 | 607 | ||
594 | #ifdef SIMULATOR | 608 | #ifdef SIMULATOR |
595 | peak_meter_l = 8000; | 609 | peak_meter_l = 8000; |
610 | #elif CONFIG_HWCODEC == MASNONE | ||
611 | /* FIX */ | ||
612 | peak_meter_l = 8000; | ||
596 | #else | 613 | #else |
597 | /* reset peak_meter_l so that subsequent calls of | 614 | /* reset peak_meter_l so that subsequent calls of |
598 | peak_meter_peek doesn't get fooled by an old | 615 | peak_meter_peek doesn't get fooled by an old |
@@ -619,6 +636,9 @@ static int peak_meter_read_r (void) { | |||
619 | 636 | ||
620 | #ifdef SIMULATOR | 637 | #ifdef SIMULATOR |
621 | peak_meter_l = 8000; | 638 | peak_meter_l = 8000; |
639 | #elif CONFIG_HWCODEC == MASNONE | ||
640 | /* FIX */ | ||
641 | peak_meter_r = 8000; | ||
622 | #else | 642 | #else |
623 | /* reset peak_meter_r so that subsequent calls of | 643 | /* reset peak_meter_r so that subsequent calls of |
624 | peak_meter_peek doesn't get fooled by an old | 644 | peak_meter_peek doesn't get fooled by an old |
@@ -897,4 +917,5 @@ bool peak_meter_histogram(void) { | |||
897 | } | 917 | } |
898 | return false; | 918 | return false; |
899 | } | 919 | } |
900 | #endif | 920 | #endif |
921 | |||