Mercurial > libavcodec.hg
changeset 8829:92bd4156f0f1 libavcodec
Revert adding a _pixfmt to vdpau/xvmc header names.
Since vdpau.h was an installed header this would break API.
| author | diego |
|---|---|
| date | Sat, 14 Feb 2009 13:37:18 +0000 |
| parents | 1801845a7e57 |
| children | c1bc8a690fc7 |
| files | Makefile vdpau.c vdpau.h vdpau_pixfmt.h xvmc.c xvmc.h xvmc_pixfmt.h |
| diffstat | 7 files changed, 165 insertions(+), 165 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Feb 14 13:12:49 2009 +0000 +++ b/Makefile Sat Feb 14 13:37:18 2009 +0000 @@ -3,7 +3,7 @@ NAME = avcodec FFLIBS = avutil -HEADERS = avcodec.h opt.h vdpau_pixfmt.h +HEADERS = avcodec.h opt.h vdpau.h OBJS = allcodecs.o \ audioconvert.o \
--- a/vdpau.c Sat Feb 14 13:12:49 2009 +0000 +++ b/vdpau.c Sat Feb 14 13:37:18 2009 +0000 @@ -29,7 +29,7 @@ #undef NDEBUG #include <assert.h> -#include "vdpau_pixfmt.h" +#include "vdpau.h" #include "vdpau_internal.h" /**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vdpau.h Sat Feb 14 13:37:18 2009 +0000 @@ -0,0 +1,86 @@ +/* + * 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. + + /** picture parameter information for all supported codecs */ + union VdpPictureInfo { + VdpPictureInfoH264 h264; + VdpPictureInfoMPEG1Or2 mpeg; + VdpPictureInfoVC1 vc1; + } info; + + /** Describe size/location of the compressed video data. */ + int bitstream_buffers_allocated; + int bitstream_buffers_used; + VdpBitstreamBuffer *bitstream_buffers; +}; + +/* @}*/ + +#endif /* AVCODEC_VDPAU_H */
--- a/vdpau_pixfmt.h Sat Feb 14 13:12:49 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -/* - * 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. - - /** picture parameter information for all supported codecs */ - union VdpPictureInfo { - VdpPictureInfoH264 h264; - VdpPictureInfoMPEG1Or2 mpeg; - VdpPictureInfoVC1 vc1; - } info; - - /** Describe size/location of the compressed video data. */ - int bitstream_buffers_allocated; - int bitstream_buffers_used; - VdpBitstreamBuffer *bitstream_buffers; -}; - -/* @}*/ - -#endif /* AVCODEC_VDPAU_H */
--- a/xvmc.c Sat Feb 14 13:12:49 2009 +0000 +++ b/xvmc.c Sat Feb 14 13:37:18 2009 +0000 @@ -29,11 +29,11 @@ #undef NDEBUG #include <assert.h> -//X11 includes are in xvmc_pixfmt.h +//X11 includes are in libavcodec/xvmc.h //by replacing it with non-X one //XvMC emulation could be performed -#include "xvmc_pixfmt.h" +#include "xvmc.h" //#include "xvmc_debug.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xvmc.h Sat Feb 14 13:37:18 2009 +0000 @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2003 Ivan Kalvachev + * + * 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_XVMC_RENDER_H +#define AVCODEC_XVMC_RENDER_H + +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/Xatom.h> +#include <X11/extensions/Xv.h> +#include <X11/extensions/Xvlib.h> +#include <X11/extensions/XvMClib.h> + + +//the surface should be shown, the video driver manipulates this +#define MP_XVMC_STATE_DISPLAY_PENDING 1 +//the surface is needed for prediction, the codec manipulates this +#define MP_XVMC_STATE_PREDICTION 2 +//this surface is needed for subpicture rendering +#define MP_XVMC_STATE_OSD_SOURCE 4 +// 1337 IDCT MCo +#define MP_XVMC_RENDER_MAGIC 0x1DC711C0 + +struct xvmc_render_state { + //these are not changed by the decoder! + int magic; + + short * data_blocks; + XvMCMacroBlock * mv_blocks; + int total_number_of_mv_blocks; + int total_number_of_data_blocks; + int mc_type; //XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT + int idct; //Do we use IDCT acceleration? + int chroma_format; //420, 422, 444 + int unsigned_intra; //+-128 for intra pictures after clipping + XvMCSurface* p_surface; //pointer to rendered surface, never changed + + //these are changed by the decoder + //used by the XvMCRenderSurface function + XvMCSurface* p_past_surface; //pointer to the past surface + XvMCSurface* p_future_surface; //pointer to the future prediction surface + + unsigned int picture_structure; //top/bottom fields or frame! + unsigned int flags; //XVMC_SECOND_FIELD - 1st or 2nd field in the sequence + unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface + + //these are for internal communication + int state; //0 - free, 1 - waiting to display, 2 - waiting for prediction + int start_mv_blocks_num; //offset in the array for the current slice, updated by vo + int filled_mv_blocks_num; //processed mv block in this slice, changed by decoder + + int next_free_data_block_num; //used in add_mv_block, pointer to next free block + //extensions + void * p_osd_target_surface_render; //pointer to the surface where subpicture is rendered + +}; + +#endif /* AVCODEC_XVMC_RENDER_H */
--- a/xvmc_pixfmt.h Sat Feb 14 13:12:49 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2003 Ivan Kalvachev - * - * 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_XVMC_RENDER_H -#define AVCODEC_XVMC_RENDER_H - -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/Xatom.h> -#include <X11/extensions/Xv.h> -#include <X11/extensions/Xvlib.h> -#include <X11/extensions/XvMClib.h> - - -//the surface should be shown, the video driver manipulates this -#define MP_XVMC_STATE_DISPLAY_PENDING 1 -//the surface is needed for prediction, the codec manipulates this -#define MP_XVMC_STATE_PREDICTION 2 -//this surface is needed for subpicture rendering -#define MP_XVMC_STATE_OSD_SOURCE 4 -// 1337 IDCT MCo -#define MP_XVMC_RENDER_MAGIC 0x1DC711C0 - -struct xvmc_render_state { - //these are not changed by the decoder! - int magic; - - short * data_blocks; - XvMCMacroBlock * mv_blocks; - int total_number_of_mv_blocks; - int total_number_of_data_blocks; - int mc_type; //XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT - int idct; //Do we use IDCT acceleration? - int chroma_format; //420, 422, 444 - int unsigned_intra; //+-128 for intra pictures after clipping - XvMCSurface* p_surface; //pointer to rendered surface, never changed - - //these are changed by the decoder - //used by the XvMCRenderSurface function - XvMCSurface* p_past_surface; //pointer to the past surface - XvMCSurface* p_future_surface; //pointer to the future prediction surface - - unsigned int picture_structure; //top/bottom fields or frame! - unsigned int flags; //XVMC_SECOND_FIELD - 1st or 2nd field in the sequence - unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface - - //these are for internal communication - int state; //0 - free, 1 - waiting to display, 2 - waiting for prediction - int start_mv_blocks_num; //offset in the array for the current slice, updated by vo - int filled_mv_blocks_num; //processed mv block in this slice, changed by decoder - - int next_free_data_block_num; //used in add_mv_block, pointer to next free block - //extensions - void * p_osd_target_surface_render; //pointer to the surface where subpicture is rendered - -}; - -#endif /* AVCODEC_XVMC_RENDER_H */