* qatar/master: doxygen: Consistently use '@' instead of '\' for Doxygen markup. Use av_printf_format to check the usage of printf style functions Add av_printf_format, for marking printf style format strings and their parameters ARM: enable thumb for Cortex-M* CPUs nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). build: remove SRC_PATH_BARE variable build: move basic rules and variables to main Makefile build: move special targets to end of main Makefile lavdev: improve feedback in case of invalid frame rate/size vfwcap: prefer "framerate_q" over "fps" in vfw_read_header() v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters() fbdev: prefer "framerate_q" over "fps" in device context bktr: prefer "framerate" over "fps" for grab_read_header() ALSA: implement channel layout for playback. alsa: support unsigned variants of already supported signed formats. alsa: add support for more formats. ARM: allow building in Thumb2 mode Conflicts: common.mak doc/APIchanges libavcodec/vdpau.h libavdevice/alsa-audio-common.c libavdevice/fbdev.c libavdevice/libdc1394.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			89 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			89 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * The Video Decode and Presentation API for UNIX (VDPAU) is used for
 | 
						|
 * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
 | 
						|
 *
 | 
						|
 * Copyright (C) 2008 NVIDIA
 | 
						|
 *
 | 
						|
 * This file is part of FFmpeg.
 | 
						|
 *
 | 
						|
 * FFmpeg is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU Lesser General Public
 | 
						|
 * License as published by the Free Software Foundation; either
 | 
						|
 * version 2.1 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * FFmpeg is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * Lesser General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Lesser General Public
 | 
						|
 * License along with FFmpeg; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef AVCODEC_VDPAU_H
 | 
						|
#define AVCODEC_VDPAU_H
 | 
						|
 | 
						|
/**
 | 
						|
 * @defgroup Decoder VDPAU Decoder and Renderer
 | 
						|
 *
 | 
						|
 * VDPAU hardware acceleration has two modules
 | 
						|
 * - VDPAU decoding
 | 
						|
 * - VDPAU presentation
 | 
						|
 *
 | 
						|
 * The VDPAU decoding module parses all headers using FFmpeg
 | 
						|
 * parsing mechanisms and uses VDPAU for the actual decoding.
 | 
						|
 *
 | 
						|
 * As per the current implementation, the actual decoding
 | 
						|
 * and rendering (API calls) are done as part of the VDPAU
 | 
						|
 * presentation (vo_vdpau.c) module.
 | 
						|
 *
 | 
						|
 * @defgroup  VDPAU_Decoding VDPAU Decoding
 | 
						|
 * @ingroup Decoder
 | 
						|
 * @{
 | 
						|
 */
 | 
						|
 | 
						|
#include <vdpau/vdpau.h>
 | 
						|
#include <vdpau/vdpau_x11.h>
 | 
						|
 | 
						|
/** @brief The videoSurface is used for rendering. */
 | 
						|
#define FF_VDPAU_STATE_USED_FOR_RENDER 1
 | 
						|
 | 
						|
/**
 | 
						|
 * @brief The videoSurface is needed for reference/prediction.
 | 
						|
 * The codec manipulates this.
 | 
						|
 */
 | 
						|
#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
 | 
						|
 | 
						|
/**
 | 
						|
 * @brief This structure is used as a callback between the FFmpeg
 | 
						|
 * decoder (vd_) and presentation (vo_) module.
 | 
						|
 * This is used for defining a video frame containing surface,
 | 
						|
 * picture parameter, bitstream information etc which are passed
 | 
						|
 * between the FFmpeg decoder and its clients.
 | 
						|
 */
 | 
						|
struct vdpau_render_state {
 | 
						|
    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
 | 
						|
 | 
						|
    int state; ///< Holds FF_VDPAU_STATE_* values.
 | 
						|
 | 
						|
    /** Describe size/location of the compressed video data.
 | 
						|
        Set to 0 when freeing bitstream_buffers. */
 | 
						|
    int bitstream_buffers_allocated;
 | 
						|
    int bitstream_buffers_used;
 | 
						|
    /** The user is responsible for freeing this buffer using av_freep(). */
 | 
						|
    VdpBitstreamBuffer *bitstream_buffers;
 | 
						|
 | 
						|
    /** picture parameter information for all supported codecs */
 | 
						|
    union VdpPictureInfo {
 | 
						|
        VdpPictureInfoH264        h264;
 | 
						|
        VdpPictureInfoMPEG1Or2    mpeg;
 | 
						|
        VdpPictureInfoVC1          vc1;
 | 
						|
        VdpPictureInfoMPEG4Part2 mpeg4;
 | 
						|
    } info;
 | 
						|
};
 | 
						|
 | 
						|
/* @}*/
 | 
						|
 | 
						|
#endif /* AVCODEC_VDPAU_H */
 |