frodovdr/vdr-plugin-softhddevice
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Fix bug: VA-API intel software decoder broken.

Browse Source
This commit is contained in:
Johns 2012-02-01 18:36:24 +01:00
parent 27e9a88e2f
commit a7389111ff
2 changed files with 7 additions and 3 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: VA-API intel software decoder broken by aspect commit.
Add support for 4:3 output modes. Add support for 4:3 output modes.
Quicker auto-crop after channel switch. Quicker auto-crop after channel switch.
Add auto-crop support for Intel VA-API backend. Add auto-crop support for Intel VA-API backend.

9
video.c
View File

@ -2188,6 +2188,8 @@ static enum PixelFormat Vaapi_get_format(VaapiDecoder * decoder,
slow_path: slow_path:
// no accelerated format found // no accelerated format found
decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2; decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
decoder->InputWidth = 0;
decoder->InputHeight = 0;
video_ctx->hwaccel_context = NULL; video_ctx->hwaccel_context = NULL;
return avcodec_default_get_format(video_ctx, fmt); return avcodec_default_get_format(video_ctx, fmt);
} }
@ -3509,7 +3511,7 @@ static void VaapiRenderFrame(VaapiDecoder * decoder,
// //
// Check image, format, size // Check image, format, size
// //
if (decoder->Image->image_id == VA_INVALID_ID if ((decoder->GetPutImage && decoder->Image->image_id == VA_INVALID_ID)
|| decoder->PixFmt != video_ctx->pix_fmt || decoder->PixFmt != video_ctx->pix_fmt
|| width != decoder->InputWidth || width != decoder->InputWidth
|| height != decoder->InputHeight) { || height != decoder->InputHeight) {
@ -5744,12 +5746,13 @@ static enum PixelFormat Vdpau_get_format(VdpauDecoder * decoder,
VdpauSetupOutput(decoder); VdpauSetupOutput(decoder);
Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0])); Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
return *fmt_idx; return *fmt_idx;
slow_path: slow_path:
// no accelerated format found // no accelerated format found
decoder->SurfacesNeeded = VIDEO_SURFACES_MAX; decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
decoder->InputWidth = 0;
decoder->InputHeight = 0;
video_ctx->hwaccel_context = NULL; video_ctx->hwaccel_context = NULL;
return avcodec_default_get_format(video_ctx, fmt); return avcodec_default_get_format(video_ctx, fmt);
} }