mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libarm clipplay-retry, thx DboxOldie

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 4d6fcc8f43
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-03-07 (Thu, 07 Mar 2019)

Origin message was:
------------------
- libarm clipplay-retry, thx DboxOldie

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Frankenstone
2019-03-07 20:41:45 +01:00
committed by max_10
parent 588abac50b
commit 143d5769bd
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libarmbox/audio.cpp
View File

@@ -12,6 +12,7 @@
#include "audio_lib.h" #include "audio_lib.h"
#include "hal_debug.h" #include "hal_debug.h"
#include <config.h>
#define AUDIO_DEVICE "/dev/dvb/adapter0/audio0" #define AUDIO_DEVICE "/dev/dvb/adapter0/audio0"
#define hal_debug(args...) _hal_debug(HAL_DEBUG_AUDIO, this, args) #define hal_debug(args...) _hal_debug(HAL_DEBUG_AUDIO, this, args)
@@ -245,8 +246,10 @@ int cAudio::PrepareClipPlay(int ch, int srate, int bits, int little_endian)
perror("SNDCTL_DSP_CHANNELS"); perror("SNDCTL_DSP_CHANNELS");
if (ioctl(clipfd, SNDCTL_DSP_SPEED, &srate)) if (ioctl(clipfd, SNDCTL_DSP_SPEED, &srate))
perror("SNDCTL_DSP_SPEED"); perror("SNDCTL_DSP_SPEED");
#if !BOXMODEL_HD51
if (ioctl(clipfd, SNDCTL_DSP_RESET)) if (ioctl(clipfd, SNDCTL_DSP_RESET))
perror("SNDCTL_DSP_RESET"); perror("SNDCTL_DSP_RESET");
#endif
if (!mix_dev) if (!mix_dev)
return 0; return 0;
@@ -299,15 +302,30 @@ int cAudio::PrepareClipPlay(int ch, int srate, int bits, int little_endian)
int cAudio::WriteClip(unsigned char *buffer, int size) int cAudio::WriteClip(unsigned char *buffer, int size)
{ {
int ret; int ret, __attribute__ ((unused)) count = 1;
// hal_debug("cAudio::%s\n", __FUNCTION__); // hal_debug("cAudio::%s\n", __FUNCTION__);
if (clipfd < 0) { if (clipfd < 0) {
hal_info("%s: clipfd not yet opened\n", __FUNCTION__); hal_info("%s: clipfd not yet opened\n", __FUNCTION__);
return -1; return -1;
} }
#if BOXMODEL_HD51
again:
#endif
ret = write(clipfd, buffer, size); ret = write(clipfd, buffer, size);
if (ret < 0) if (ret < 0) {
hal_info("%s: write error (%m)\n", __FUNCTION__); hal_info("%s: write error (%m)\n", __FUNCTION__);
return ret;
}
#if BOXMODEL_HD51
if (ret != size) {
hal_info("cAudio::%s: difference > to write (%d) != written (%d) try (%d) > reset dsp and restart write\n", __FUNCTION__, size, ret, count);
if (ioctl(clipfd, SNDCTL_DSP_RESET))
perror("SNDCTL_DSP_RESET");
count++;
if (count < 3)
goto again;
}
#endif
return ret; return ret;
}; };