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

Crop setup is done by VdpauSetupOutput.

Browse Source
This commit is contained in:
Johns 2013-01-22 17:08:44 +01:00
parent 849ca7cfd6
commit a1f17199d6
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
video.c
View File

@ -6839,13 +6839,6 @@ static enum PixelFormat Vdpau_get_format(VdpauDecoder * decoder,
VdpauGetErrorString(status)); VdpauGetErrorString(status));
goto slow_path; goto slow_path;
} }
// FIXME: combine this with VdpauSetupOutput and software decoder part
decoder->CropX = VideoCutLeftRight[decoder->Resolution];
decoder->CropY = VideoCutTopBottom[decoder->Resolution];
decoder->CropWidth =
video_ctx->width - VideoCutLeftRight[decoder->Resolution] * 2;
decoder->CropHeight =
video_ctx->height - VideoCutTopBottom[decoder->Resolution] * 2;
decoder->PixFmt = *fmt_idx; decoder->PixFmt = *fmt_idx;
decoder->InputWidth = video_ctx->width; decoder->InputWidth = video_ctx->width;
@ -7244,13 +7237,6 @@ static void VdpauAutoCrop(VdpauDecoder * decoder)
decoder->InputWidth, decoder->InputHeight, decoder->OutputWidth, decoder->InputWidth, decoder->InputHeight, decoder->OutputWidth,
decoder->OutputHeight, decoder->OutputX, decoder->OutputY); decoder->OutputHeight, decoder->OutputX, decoder->OutputY);
} else { } else {
decoder->CropX = VideoCutLeftRight[decoder->Resolution];
decoder->CropY = VideoCutTopBottom[decoder->Resolution];
decoder->CropWidth =
decoder->InputWidth - VideoCutLeftRight[decoder->Resolution] * 2;
decoder->CropHeight =
decoder->InputHeight - VideoCutTopBottom[decoder->Resolution] * 2;
// sets AutoCrop->Count // sets AutoCrop->Count
VdpauUpdateOutput(decoder); VdpauUpdateOutput(decoder);
} }
@ -7461,13 +7447,6 @@ static void VdpauRenderFrame(VdpauDecoder * decoder,
|| video_ctx->width != decoder->InputWidth || video_ctx->width != decoder->InputWidth
|| video_ctx->height != decoder->InputHeight) { || video_ctx->height != decoder->InputHeight) {
decoder->CropX = VideoCutLeftRight[decoder->Resolution];
decoder->CropY = VideoCutTopBottom[decoder->Resolution];
decoder->CropWidth =
video_ctx->width - VideoCutLeftRight[decoder->Resolution] * 2;
decoder->CropHeight =
video_ctx->height - VideoCutTopBottom[decoder->Resolution] * 2;
decoder->PixFmt = video_ctx->pix_fmt; decoder->PixFmt = video_ctx->pix_fmt;
decoder->InputWidth = video_ctx->width; decoder->InputWidth = video_ctx->width;
decoder->InputHeight = video_ctx->height; decoder->InputHeight = video_ctx->height;
@ -8133,6 +8112,13 @@ static void VdpauSyncDecoder(VdpauDecoder * decoder)
VdpauAdvanceDecoderFrame(decoder); VdpauAdvanceDecoderFrame(decoder);
decoder->SyncCounter = 1; decoder->SyncCounter = 1;
} }
#if defined(DEBUG) || defined(AV_INFO)
if (!decoder->SyncCounter && decoder->StartCounter < 1000) {
Debug(3, "video/vdpau: synced after %d frames\n",
decoder->StartCounter);
decoder->StartCounter += 1000;
}
#endif
} }
skip_sync: skip_sync:
@ -10599,6 +10585,7 @@ void VideoSetCutTopBottom(int pixels[VideoResolutionMax])
VideoCutTopBottom[1] = pixels[1]; VideoCutTopBottom[1] = pixels[1];
VideoCutTopBottom[2] = pixels[2]; VideoCutTopBottom[2] = pixels[2];
VideoCutTopBottom[3] = pixels[3]; VideoCutTopBottom[3] = pixels[3];
// FIXME: update output
} }
/// ///
@ -10612,6 +10599,7 @@ void VideoSetCutLeftRight(int pixels[VideoResolutionMax])
VideoCutLeftRight[1] = pixels[1]; VideoCutLeftRight[1] = pixels[1];
VideoCutLeftRight[2] = pixels[2]; VideoCutLeftRight[2] = pixels[2];
VideoCutLeftRight[3] = pixels[3]; VideoCutLeftRight[3] = pixels[3];
// FIXME: update output
} }
/// ///