From fd60c3c1325f8254276b70a91eba8d28402a4ddb Mon Sep 17 00:00:00 2001 From: Johns Date: Sat, 7 Jan 2012 22:36:06 +0100 Subject: Support yaepghd video output position change. And code and comments cleanups. --- video.h | 60 ++++++++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) (limited to 'video.h') diff --git a/video.h b/video.h index 9962cf3..159d019 100644 --- a/video.h +++ b/video.h @@ -30,13 +30,6 @@ /// Video hardware decoder typedef typedef struct _video_hw_decoder_ VideoHwDecoder; -//---------------------------------------------------------------------------- -// Variables -//---------------------------------------------------------------------------- - -//extern unsigned VideoWindowWidth; ///< current video output width -//extern unsigned VideoWindowHeight; ///< current video output height - //---------------------------------------------------------------------------- // Prototypes //---------------------------------------------------------------------------- @@ -47,14 +40,14 @@ extern VideoHwDecoder *VideoNewHwDecoder(void); /// Get and allocate a video hardware surface. extern unsigned VideoGetSurface(VideoHwDecoder *); - /// Release a video hardware surface. + /// Release a video hardware surface extern void VideoReleaseSurface(VideoHwDecoder *, unsigned); #ifdef LIBAVCODEC_VERSION - /// Render a ffmpeg frame + /// Render a ffmpeg frame. extern void VideoRenderFrame(VideoHwDecoder *, AVCodecContext *, AVFrame *); - /// Get ffmpeg vaapi context + /// Get ffmpeg vaapi context. extern struct vaapi_context *VideoGetVaapiContext(VideoHwDecoder *); /// Callback to negotiate the PixelFormat. @@ -62,57 +55,60 @@ extern enum PixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *, const enum PixelFormat *); #ifdef AVCODEC_VDPAU_H - /// Draw vdpau render state + /// Draw vdpau render state. extern void VideoDrawRenderState(VideoHwDecoder *, struct vdpau_render_state *); #endif #endif - /// Display video TEST -extern void VideoDisplayHandler(void); - - /// Poll video events + /// Poll video events. extern void VideoPollEvent(void); - /// set video mode + /// Wakeup display handler. +extern void VideoDisplayWakeup(void); + + /// Set video mode. //extern void VideoSetVideoMode(int, int, int, int); - /// set video geometry + /// Set video geometry. extern int VideoSetGeometry(const char *); - /// set deinterlace + /// Set video output position. +extern void VideoSetOutputPosition(int, int, int, int); + + /// Set deinterlace. extern void VideoSetDeinterlace(int); - /// set skip chroma deinterlace + /// Set skip chroma deinterlace. extern void VideoSetSkipChromaDeinterlace(int); - /// set scaling + /// Set scaling. extern void VideoSetScaling(int); - /// set denoise + /// Set denoise. extern void VideoSetDenoise(int); - /// set sharpen + /// Set sharpen. extern void VideoSetSharpen(int); - /// set audio delay + /// Set audio delay. extern void VideoSetAudioDelay(int); - /// Clear OSD + /// Clear OSD. extern void VideoOsdClear(void); - /// Draw an OSD ARGB image + /// Draw an OSD ARGB image. extern void VideoOsdDrawARGB(int, int, int, int, const uint8_t *); -extern int64_t VideoGetClock(void); ///< get video clock +extern int64_t VideoGetClock(void); ///< Get video clock. -extern void VideoOsdInit(void); ///< setup osd -extern void VideoOsdExit(void); ///< cleanup osd +extern void VideoOsdInit(void); ///< Setup osd. +extern void VideoOsdExit(void); ///< Cleanup osd. -extern void VideoInit(const char *); ///< setup video module -extern void VideoExit(void); ///< cleanup and exit video module +extern void VideoInit(const char *); ///< Setup video module. +extern void VideoExit(void); ///< Cleanup and exit video module. -extern void VideoFlushInput(void); ///< flush codec input buffers -extern int VideoDecode(void); ///< decode +extern void VideoFlushInput(void); ///< Flush video input buffers. +extern int VideoDecode(void); ///< Decode video input buffers. /// @} -- cgit v1.2.3