diff options
| author | Johns <johns98@gmx.net> | 2012-01-27 21:08:37 +0100 |
|---|---|---|
| committer | Johns <johns98@gmx.net> | 2012-01-27 21:08:37 +0100 |
| commit | f8d198636b5291f4328d5b3f572cc084b68bda87 (patch) | |
| tree | 4260766f22c6722712bc7f6ac32acf8e6d7af012 /softhddev.c | |
| parent | bcf6ecabc1ca83d8f6de578ee2d25ad162518981 (diff) | |
| download | vdr-plugin-softhddevice-f8d198636b5291f4328d5b3f572cc084b68bda87.tar.gz vdr-plugin-softhddevice-f8d198636b5291f4328d5b3f572cc084b68bda87.tar.bz2 | |
Video bug fix.
Made video_test working again.
Disabled VA-API Intel vaAssociateSubpicture workaround.
Fix bug: Must release lock for VideoPollEvent.
Allow faster video and audio sync.
Fix bug: Software decoder use vaPutImage with Intel backend.
Fix bug: Artefacts are shown after mpeg2 channel switch.
Fix bug: VideoReleaseSurface called after VideoExit.
Diffstat (limited to 'softhddev.c')
| -rw-r--r-- | softhddev.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/softhddev.c b/softhddev.c index 1380424..5abdd11 100644 --- a/softhddev.c +++ b/softhddev.c @@ -124,6 +124,8 @@ static const uint16_t SampleRateTable[4] = { ** FrameLengthInBytes = (12 * BitRate / SampleRate + Padding) * 4 ** Layer II & III: ** FrameLengthInBytes = 144 * BitRate / SampleRate + Padding +** +** @todo sometimes detects wrong position */ static int FindAudioSync(const AVPacket * avpkt) { @@ -289,16 +291,17 @@ int PlayAudio(const uint8_t * data, int size, return osize; } + avpkt->pts = AV_NOPTS_VALUE; + AudioIncreaseBufferTime(); CodecAudioOpen(MyAudioDecoder, NULL, CODEC_ID_MP2); AudioCodecID = CODEC_ID_MP2; data += n; size -= n; } - } - - // no decoder or codec known - if (AudioCodecID == CODEC_ID_NONE) { - return osize; + // no decoder or codec known + if (AudioCodecID == CODEC_ID_NONE) { + return osize; + } } avpkt->data = (void *)data; @@ -350,7 +353,7 @@ static volatile char Usr1Signal; ///< true got usr1 signal static AVPacket VideoPacketRb[VIDEO_PACKET_MAX]; static int VideoPacketWrite; ///< write pointer static int VideoPacketRead; ///< read pointer -static atomic_t VideoPacketsFilled; ///< how many of the buffer is used +atomic_t VideoPacketsFilled; ///< how many of the buffer is used static volatile char VideoClearBuffers; ///< clear video buffers static volatile char SkipVideo; ///< skip video @@ -599,6 +602,7 @@ static void StopVideo(void) VideoOsdExit(); VideoExit(); if (MyVideoDecoder) { + // FIXME: this can crash, hw decoder released by video exit CodecVideoClose(MyVideoDecoder); CodecVideoDelDecoder(MyVideoDecoder); MyVideoDecoder = NULL; @@ -791,8 +795,7 @@ int PlayVideo(const uint8_t * data, int size) return size; } // FIXME: incomplete packets produce artefacts after channel switch - if (atomic_read(&VideoPacketsFilled) - && VideoCodecID == CODEC_ID_MPEG2VIDEO) { + if (0 && VideoCodecID == CODEC_ID_MPEG2VIDEO) { // mpeg codec supports incomplete packets // waiting for a full complete packages, increases needed delays VideoNextPacket(CODEC_ID_MPEG2VIDEO); |