frodovdr
/
vdr-plugin-softhddevice
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix bug #1089: vdpau wrong number of mpeg refs.

This commit is contained in:
Johns 2012-10-24 15:38:09 +02:00
parent 0519aff4d8
commit 30952face4
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
User johns User johns
Date: Date:
Fix bug #1089: Vdpau decoder used wrong number of mpeg reference frames.
Fix bug: with some streams endless loop in pes audio parser. Fix bug: with some streams endless loop in pes audio parser.
Report correct video size in cSoftHdDevice::GetVideoSize. Report correct video size in cSoftHdDevice::GetVideoSize.
Add picture adjustment support for vdpau. Add picture adjustment support for vdpau.

24
codec.c
View File

@ -385,6 +385,17 @@ void CodecVideoOpen(VideoDecoder * decoder, const char *name, int codec_id)
Fatal(_("codec: can't open video codec!\n")); Fatal(_("codec: can't open video codec!\n"));
} }
#else #else
if (video_codec->capabilities & (CODEC_CAP_HWACCEL_VDPAU |
CODEC_CAP_HWACCEL)) {
Debug(3, "codec: video mpeg hack active\n");
// HACK around badly placed checks in mpeg_mc_decode_init
// taken from mplayer vd_ffmpeg.c
decoder->VideoCtx->slice_flags =
SLICE_FLAG_CODED_ORDER | SLICE_FLAG_ALLOW_FIELD;
decoder->VideoCtx->thread_count = 1;
decoder->VideoCtx->active_thread_type = 0;
}
if (avcodec_open2(decoder->VideoCtx, video_codec, NULL) < 0) { if (avcodec_open2(decoder->VideoCtx, video_codec, NULL) < 0) {
pthread_mutex_unlock(&CodecLockMutex); pthread_mutex_unlock(&CodecLockMutex);
Fatal(_("codec: can't open video codec!\n")); Fatal(_("codec: can't open video codec!\n"));
@ -402,7 +413,7 @@ void CodecVideoOpen(VideoDecoder * decoder, const char *name, int codec_id)
} }
if (video_codec->capabilities & CODEC_CAP_TRUNCATED) { if (video_codec->capabilities & CODEC_CAP_TRUNCATED) {
Debug(3, "codec: video can use truncated packets\n"); Debug(3, "codec: video can use truncated packets\n");
// we do not send complete frames // we send incomplete frames, for old PES recordings
decoder->VideoCtx->flags |= CODEC_FLAG_TRUNCATED; decoder->VideoCtx->flags |= CODEC_FLAG_TRUNCATED;
} }
// FIXME: own memory management for video frames. // FIXME: own memory management for video frames.
@ -538,6 +549,11 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
Debug(4, "%s: %p %d -> %d %d\n", __FUNCTION__, pkt->data, pkt->size, used, Debug(4, "%s: %p %d -> %d %d\n", __FUNCTION__, pkt->data, pkt->size, used,
got_frame); got_frame);
if (used < 0) {
Debug(3, "codec: bad video frame\n");
return;
}
if (got_frame) { // frame completed if (got_frame) { // frame completed
//DisplayPts(video_ctx, frame); //DisplayPts(video_ctx, frame);
VideoRenderFrame(decoder->HwDecoder, video_ctx, frame); VideoRenderFrame(decoder->HwDecoder, video_ctx, frame);
@ -548,6 +564,9 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
Debug(4, "codec: %8d incomplete interlaced frame %d bytes used\n", Debug(4, "codec: %8d incomplete interlaced frame %d bytes used\n",
video_ctx->frame_number, used); video_ctx->frame_number, used);
} }
#if 1
// old code to support truncated or multi frame packets
if (used != pkt->size) { if (used != pkt->size) {
// ffmpeg 0.8.7 dislikes our seq_end_h264 and enters endless loop here // ffmpeg 0.8.7 dislikes our seq_end_h264 and enters endless loop here
if (used == 0 && pkt->size == 5 && pkt->data[4] == 0x0A) { if (used == 0 && pkt->size == 5 && pkt->data[4] == 0x0A) {
@ -561,10 +580,11 @@ void CodecVideoDecode(VideoDecoder * decoder, const AVPacket * avpkt)
used, pkt->size); used, pkt->size);
pkt->size -= used; pkt->size -= used;
pkt->data += used; pkt->data += used;
// FIXME: align problem?
goto next_part; goto next_part;
} }
Debug(3, "codec: bad frame %d\n", used);
} }
#endif
} }
/** /**

4
softhddev.c
View File

@ -1236,7 +1236,7 @@ void SetVolumeDevice(int volume)
#ifdef DEBUG #ifdef DEBUG
uint32_t VideoSwitch; ///< debug video switch ticks uint32_t VideoSwitch; ///< debug video switch ticks
#endif #endif
//#define STILL_DEBUG 1 //#define STILL_DEBUG 2
#ifdef STILL_DEBUG #ifdef STILL_DEBUG
static char InStillPicture; ///< flag still picture static char InStillPicture; ///< flag still picture
#endif #endif
@ -1406,7 +1406,7 @@ static void VideoNextPacket(int codec_id)
/** /**
** Fix packet for FFMpeg. ** Fix packet for FFMpeg.
** **
** Some tv-stations sends mulitple pictures in a singe PES packet. ** Some tv-stations sends mulitple pictures in a single PES packet.
** Current ffmpeg 0.10 and libav-0.8 has problems with this. ** Current ffmpeg 0.10 and libav-0.8 has problems with this.
** Split the packet into single picture packets. ** Split the packet into single picture packets.
*/ */

6
video.c
View File

@ -261,7 +261,7 @@ typedef struct _video_module_
#define CODEC_SURFACES_MAX 31 ///< maximal of surfaces #define CODEC_SURFACES_MAX 31 ///< maximal of surfaces
#define CODEC_SURFACES_DEFAULT (21+4) ///< default of surfaces #define CODEC_SURFACES_DEFAULT 21 ///< default of surfaces
// FIXME: video-xvba only supports 14 // FIXME: video-xvba only supports 14
#define xCODEC_SURFACES_DEFAULT 14 ///< default of surfaces #define xCODEC_SURFACES_DEFAULT 14 ///< default of surfaces
@ -6677,11 +6677,11 @@ static enum PixelFormat Vdpau_get_format(VdpauDecoder * decoder,
// check profile // check profile
switch (video_ctx->codec_id) { switch (video_ctx->codec_id) {
case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG1VIDEO:
max_refs = 2; max_refs = CODEC_SURFACES_MPEG2;
profile = VdpauCheckProfile(decoder, VDP_DECODER_PROFILE_MPEG1); profile = VdpauCheckProfile(decoder, VDP_DECODER_PROFILE_MPEG1);
break; break;
case CODEC_ID_MPEG2VIDEO: case CODEC_ID_MPEG2VIDEO:
max_refs = 2; max_refs = CODEC_SURFACES_MPEG2;
profile = profile =
VdpauCheckProfile(decoder, VDP_DECODER_PROFILE_MPEG2_MAIN); VdpauCheckProfile(decoder, VDP_DECODER_PROFILE_MPEG2_MAIN);
break; break;