summaryrefslogtreecommitdiff
path: root/contrib/ffmpeg/libavcodec/xvmc_render.h
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ffmpeg/libavcodec/xvmc_render.h')
-rw-r--r--contrib/ffmpeg/libavcodec/xvmc_render.h43
1 files changed, 34 insertions, 9 deletions
diff --git a/contrib/ffmpeg/libavcodec/xvmc_render.h b/contrib/ffmpeg/libavcodec/xvmc_render.h
index 37b342294..10fd56ffa 100644
--- a/contrib/ffmpeg/libavcodec/xvmc_render.h
+++ b/contrib/ffmpeg/libavcodec/xvmc_render.h
@@ -1,3 +1,26 @@
+/*
+ * 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 FFMPEG_XVMC_RENDER_H
+#define FFMPEG_XVMC_RENDER_H
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
@@ -6,9 +29,9 @@
#include <X11/extensions/XvMClib.h>
-//the surface should be shown, video driver manipulate this
+//the surface should be shown, video driver manipulates this
#define MP_XVMC_STATE_DISPLAY_PENDING 1
-//the surface is needed for prediction, codec manipulate this
+//the surface is needed for prediction, codec manipulates this
#define MP_XVMC_STATE_PREDICTION 2
//this surface is needed for subpicture rendering
#define MP_XVMC_STATE_OSD_SOURCE 4
@@ -16,7 +39,7 @@
#define MP_XVMC_RENDER_MAGIC 0x1DC711C0
typedef struct{
-//these are not changed by decoder!
+//these are not changed by the decoder!
int magic;
short * data_blocks;
@@ -24,7 +47,7 @@ typedef struct{
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;//does we use IDCT acceleration?
+ int idct;//Do we use IDCT acceleration?
int chroma_format;//420,422,444
int unsigned_intra;//+-128 for intra pictures after clip
XvMCSurface* p_surface;//pointer to rendered surface, never changed
@@ -34,17 +57,19 @@ typedef struct{
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 picture_structure;//top/bottom fields or frame!
unsigned int flags;//XVMC_SECOND_FIELD - 1'st or 2'd field in the sequence
unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface,
-//these are internal communication one
- 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,change by decoder
+//these are internal communication ones
+ 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
} xvmc_render_state_t;
+
+#endif /* FFMPEG_XVMC_RENDER_H */