X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e8cae716ad3fdf29a7b2a45e5eec0a530f93277..3dfafb8052158a04e3f2316bf3b63a5a79ab331e:/lib/dvb/decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 76d0f504..6b4a7f25 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -144,13 +144,10 @@ void eDVBAudio::setChannel(int channel)
 	{
 	case aMonoLeft: val = AUDIO_MONO_LEFT; break;
 	case aMonoRight: val = AUDIO_MONO_RIGHT; break;
-	default:
-		break;
+	default: break;
 	}
 	if (::ioctl(m_fd, AUDIO_CHANNEL_SELECT, val) < 0)
 		eDebug("video: AUDIO_CHANNEL_SELECT: %m");
-	else
-		eDebug("AUDIO_CHANNEL_SELECT ok");
 }
 
 int eDVBAudio::getPTS(pts_t &now)
@@ -408,7 +405,8 @@ int eTSMPEGDecoder::setState()
 	
 	if ((nott && m_text) || (!m_text && !nott))
 		m_changed |= changeText;
-	
+
+	bool changed = !!m_changed;
 #if HAVE_DVB_API_VERSION < 3
 	if (m_changed & changeAudio && m_audio)
 		m_audio->stopPid();
@@ -480,7 +478,7 @@ int eTSMPEGDecoder::setState()
 	{
 		eDebug("VIDEO CHANGED (to %04x)", m_vpid);
 		if (m_video)
-		{	
+		{
 			eDebug("STOP");
 			m_video->stop();
 		}
@@ -530,9 +528,43 @@ int eTSMPEGDecoder::setState()
 		m_changed &= ~changeText;
 	}
 #endif
+	if (changed && !m_video && m_audio && m_radio_pic.length())
+		showSinglePic(m_radio_pic.c_str());
+
 	return res;
 }
 
+int eTSMPEGDecoder::m_pcm_delay=-1,
+	eTSMPEGDecoder::m_ac3_delay=-1;
+
+RESULT eTSMPEGDecoder::setPCMDelay(int delay)
+{
+	if (m_decoder == 0 && delay != m_pcm_delay )
+	{
+		FILE *fp = fopen("/proc/stb/audio/audio_delay_pcm", "w");
+		if (fp)
+		{
+			fprintf(fp, "%x", delay*90);
+			fclose(fp);
+			m_pcm_delay = delay;
+		}
+	}
+}
+
+RESULT eTSMPEGDecoder::setAC3Delay(int delay)
+{
+	if ( m_decoder == 0 && delay != m_ac3_delay )
+	{
+		FILE *fp = fopen("/proc/stb/audio/audio_delay_bitstream", "w");
+		if (fp)
+		{
+			fprintf(fp, "%x", delay*90);
+			fclose(fp);
+			m_ac3_delay = delay;
+		}
+	}
+}
+
 eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0), m_decoder(decoder)
 {
 	demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event);
@@ -568,15 +600,30 @@ RESULT eTSMPEGDecoder::setAudioPID(int apid, int type)
 	return 0;
 }
 
+int eTSMPEGDecoder::m_audio_channel = -1;
+
 RESULT eTSMPEGDecoder::setAudioChannel(int channel)
 {
-	if (m_audio)
-		m_audio->setChannel(channel);
-	else
-		eDebug("eTSMPEGDecoder::setAudioChannel but no audio decoder exist");
+	if (channel == -1)
+		channel = ac_stereo;
+	if (m_decoder == 0 && m_audio_channel != channel)
+	{
+		if (m_audio)
+		{
+			m_audio->setChannel(channel);
+			m_audio_channel=channel;
+		}
+		else
+			eDebug("eTSMPEGDecoder::setAudioChannel but no audio decoder exist");
+	}
 	return 0;
 }
 
+int eTSMPEGDecoder::getAudioChannel()
+{
+	return m_audio_channel == -1 ? ac_stereo : m_audio_channel;
+}
+
 RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid)
 {
 	if (m_pcrpid != pcrpid)
@@ -719,3 +766,80 @@ RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts)
 
 	return -1;
 }
+
+RESULT eTSMPEGDecoder::setRadioPic(const std::string &filename)
+{
+	m_radio_pic = filename;
+}
+
+RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
+{
+	if (m_decoder == 0)
+	{
+		FILE *f = fopen(filename, "r");
+		if (f)
+		{
+			int vfd = open("/dev/dvb/adapter0/video0", O_RDWR);
+			if (vfd > 0)
+			{
+				fseek(f, 0, SEEK_END);
+				int length = ftell(f);
+				unsigned char *buffer = new unsigned char[length*3+9];
+				if (ioctl(vfd, VIDEO_FAST_FORWARD, 1) < 0)
+					eDebug("VIDEO_FAST_FORWARD failed (%m)");
+				if (ioctl(vfd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY) < 0)
+					eDebug("VIDEO_SELECT_SOURCE MEMORY failed (%m)");
+				if (ioctl(vfd, VIDEO_PLAY) < 0)
+					eDebug("VIDEO_PLAY failed (%m)");
+				int cnt=0;
+				int pos=0;
+				while(cnt<3)
+				{
+					int rd;
+					fseek(f, 0, SEEK_SET);
+					while(1)
+					{
+						if (!cnt)
+						{
+							buffer[pos++]=0;
+							buffer[pos++]=0;
+							buffer[pos++]=1;
+							buffer[pos++]=0xE0;
+							buffer[pos++]=(length*3)>>8;
+							buffer[pos++]=(length*3)&0xFF;
+							buffer[pos++]=0x80;
+							buffer[pos++]=0;
+							buffer[pos++]=0;
+						}
+						rd = fread(buffer+pos, 1, length, f);
+						if (rd > 0)
+							pos += rd;
+						else
+							break;
+					}
+					++cnt;
+				}
+				write(vfd, buffer, pos);
+				usleep(75000);  // i dont like this.. but i dont have a better solution :(
+				if (ioctl(vfd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX) < 0)
+					eDebug("VIDEO_SELECT_SOURCE DEMUX failed (%m)");
+				if (ioctl(vfd, VIDEO_FAST_FORWARD, 0) < 0)
+					eDebug("VIDEO_FAST_FORWARD failed (%m)");
+				close(vfd);
+				delete [] buffer;
+			}
+			fclose(f);
+		}
+		else
+		{
+			eDebug("couldnt open %s", filename);
+			return -1;
+		}
+	}
+	else
+	{
+		eDebug("only show single pics on first decoder");
+		return -1;
+	}
+	return 0;
+}