[FFmpeg-cvslog] r16444 - in trunk/libavcodec: vdpau.h vdpau_render.h vdpauvideo.c

[cehoyos]

Author: cehoyos
Date: Tue Jan  6 00:23:32 2009
New Revision: 16444

Log:
Rename vdpau_render.h as vdpau.h.

Added:
   trunk/libavcodec/vdpau.h   (props changed)
      - copied unchanged from r16439, trunk/libavcodec/vdpau_render.h
Deleted:
   trunk/libavcodec/vdpau_render.h
Modified:
   trunk/libavcodec/vdpauvideo.c

Copied: trunk/libavcodec/vdpau.h (from r16439, trunk/libavcodec/vdpau_render.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libavcodec/vdpau.h	Tue Jan  6 00:23:32 2009	(r16444, copy of r16439, trunk/libavcodec/vdpau_render.h)
@@ -0,0 +1,84 @@
+/*
+ * 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_RENDER_H
+#define AVCODEC_VDPAU_RENDER_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;
+    } info;
+
+    /** Describe size/location of the compressed video data. */
+    int bitstreamBuffersAllocated;
+    int bitstreamBuffersUsed;
+    VdpBitstreamBuffer *bitstreamBuffers;
+};
+
+/* @}*/
+
+#endif /* AVCODEC_VDPAU_RENDER_H */

Modified: trunk/libavcodec/vdpauvideo.c
==============================================================================
--- trunk/libavcodec/vdpauvideo.c	Tue Jan  6 00:15:14 2009	(r16443)
+++ trunk/libavcodec/vdpauvideo.c	Tue Jan  6 00:23:32 2009	(r16444)
@@ -28,7 +28,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-#include "vdpau_render.h"
+#include "vdpau.h"
 #include "vdpau_internal.h"
 
 /**