Cleanups and Codec..Del.. prototypes.

This commit is contained in:
Johns 2012-01-22 17:07:08 +01:00
parent 970493fb23
commit 98d2e0f728
5 changed files with 21 additions and 6 deletions

View File

@ -1,10 +1,13 @@
User johns
Date:
User Morone
Data: Sun Jan 22 16:43:23 CET 2012
Date: Sun Jan 22 16:43:23 CET 2012
Use different alsa devices for AC3/pass-through and pcm.
User johns
Data: Sun Jan 22 11:12:57 CET 2012
Date: Sun Jan 22 11:12:57 CET 2012
Add dummy player and control for suspend mode.
Buffertime compile time configurable in ms.

4
Todo
View File

@ -31,11 +31,13 @@ video:
subtitle not cleared
subtitle could be asyncron
reduce warnings after channel switch
grab image with scaling support
suspendoutput didn't show logo or black pictures
(must detect video format to show image)
vdpau:
VdpPreemptionCallback handling (under construction)
hard channel switch
suspendoutput didn't show logo or black picture.
libva:
hard channel switch

View File

@ -40,6 +40,9 @@ typedef struct _audio_decoder_ AudioDecoder;
/// Allocate a new video decoder context.
extern VideoDecoder *CodecVideoNewDecoder(VideoHwDecoder *);
/// Deallocate a video decoder context.
extern void CodecVideoDelDecoder(VideoDecoder *);
/// Open video codec.
extern void CodecVideoOpen(VideoDecoder *, const char *, int);
@ -55,6 +58,9 @@ extern void CodecVideoFlushBuffers(VideoDecoder *);
/// Allocate a new audio decoder context.
extern AudioDecoder *CodecAudioNewDecoder(void);
/// Deallocate an audio decoder context.
extern void CodecAudioDelDecoder(AudioDecoder *);
/// Open audio codec.
extern void CodecAudioOpen(AudioDecoder *, const char *, int);

View File

@ -716,7 +716,7 @@ bool cSoftHdDevice::SetPlayMode(ePlayMode play_mode)
int64_t cSoftHdDevice::GetSTC(void)
{
// dsyslog("[softhddev]%s:\n", __FUNCTION__);
//dsyslog("[softhddev]%s:\n", __FUNCTION__);
return::VideoGetClock();
}
@ -798,7 +798,7 @@ void cSoftHdDevice::StillPicture(const uchar * data, int length)
bool cSoftHdDevice::Poll(
__attribute__ ((unused)) cPoller & poller, int timeout_ms)
{
// dsyslog("[softhddev]%s: %d\n", __FUNCTION__, timeout_ms);
//dsyslog("[softhddev]%s: %d\n", __FUNCTION__, timeout_ms);
return::Poll(timeout_ms);
}
@ -1074,13 +1074,14 @@ const char *cPluginSoftHdDevice::MainMenuEntry(void)
*/
cOsdObject *cPluginSoftHdDevice::MainMenuAction(void)
{
dsyslog("[softhddev]%s:\n", __FUNCTION__);
//dsyslog("[softhddev]%s:\n", __FUNCTION__);
//MyDevice->StopReplay();
cControl::Launch(new cSoftHdControl);
cControl::Attach();
Suspend();
if (ShutdownHandler.GetUserInactiveTime()) {
dsyslog("[softhddev]%s: set user inactive\n", __FUNCTION__);
ShutdownHandler.SetUserInactive();
}

View File

@ -5331,6 +5331,9 @@ static uint8_t *VdpauGrabOutputSurface(int *ret_size, int *ret_width,
Debug(3, "video/vdpau: grab %dx%d format %d\n", width, height,
rgba_format);
// FIXME: scale surface to requested size with
// VdpauOutputSurfaceRenderOutputSurface
switch (rgba_format) {
case VDP_RGBA_FORMAT_B8G8R8A8:
case VDP_RGBA_FORMAT_R8G8B8A8: