Mercurial > libavcodec.hg
annotate xvmc.h @ 8906:23f3b98db75c libavcodec
Move the state field in the xvmc struct to the extensions section.
It has always been a workaround for MPlayer limitations.
author | iive |
---|---|
date | Sun, 15 Feb 2009 01:28:50 +0000 |
parents | 9f1f4704d89c |
children | c9e8aed08d17 |
rev | line source |
---|---|
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
1 /* |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
2 * Copyright (C) 2003 Ivan Kalvachev |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
3 * |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
4 * This file is part of FFmpeg. |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
5 * |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
6 * FFmpeg is free software; you can redistribute it and/or |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
7 * modify it under the terms of the GNU Lesser General Public |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
8 * License as published by the Free Software Foundation; either |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
9 * version 2.1 of the License, or (at your option) any later version. |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
10 * |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
11 * FFmpeg is distributed in the hope that it will be useful, |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
14 * Lesser General Public License for more details. |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
15 * |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
16 * You should have received a copy of the GNU Lesser General Public |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
17 * License along with FFmpeg; if not, write to the Free Software |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
19 */ |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
20 |
8843 | 21 #ifndef AVCODEC_XVMC_H |
22 #define AVCODEC_XVMC_H | |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
23 |
8851
a8fdc730936d
Replace useless X11 #includes by the one that actually provides the required
diego
parents:
8850
diff
changeset
|
24 #include <X11/extensions/XvMC.h> |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
25 |
8899
856ed45c4cfa
Add avcodec.h #include so that LIBAVCODEC_VERSION_MAJOR is not undefined.
diego
parents:
8898
diff
changeset
|
26 #include "avcodec.h" |
856ed45c4cfa
Add avcodec.h #include so that LIBAVCODEC_VERSION_MAJOR is not undefined.
diego
parents:
8898
diff
changeset
|
27 |
8854 | 28 #define AV_XVMC_STATE_DISPLAY_PENDING 1 /** the surface should be shown, the video driver manipulates this */ |
29 #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */ | |
30 #define AV_XVMC_STATE_OSD_SOURCE 4 /** this surface is needed for subpicture rendering */ | |
31 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */ | |
32 // 1337 IDCT MCo | |
8846 | 33 |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
34 struct xvmc_render_state { |
8853
b0292c878f9d
clarify xvmc struct fields usage distribution (internal communication)
iive
parents:
8852
diff
changeset
|
35 /** set by calling application */ |
8852 | 36 //@{ |
8870
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8864
diff
changeset
|
37 int magic; ///< used as a check against memory corruption by regular pixel routines |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
38 |
8850 | 39 short* data_blocks; |
40 XvMCMacroBlock* mv_blocks; | |
41 int total_number_of_mv_blocks; | |
42 int total_number_of_data_blocks; | |
8854 | 43 int idct; ///< indicate that IDCT acceleration level is used |
44 int unsigned_intra; ///< +-128 for intra pictures after clipping | |
45 XvMCSurface* p_surface; ///< pointer to rendered surface, never changed | |
8852 | 46 //}@ |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
47 |
8853
b0292c878f9d
clarify xvmc struct fields usage distribution (internal communication)
iive
parents:
8852
diff
changeset
|
48 /** set by the decoder |
b0292c878f9d
clarify xvmc struct fields usage distribution (internal communication)
iive
parents:
8852
diff
changeset
|
49 used by the XvMCRenderSurface function */ |
8852 | 50 //@{ |
8854 | 51 XvMCSurface* p_past_surface; ///< pointer to the past surface |
52 XvMCSurface* p_future_surface; ///< pointer to the future prediction surface | |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
53 |
8870
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8864
diff
changeset
|
54 unsigned int picture_structure; ///< top/bottom fields or frame |
8854 | 55 unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence |
8903
9f1f4704d89c
Drop struct members display_flags and state with the next major version bump.
diego
parents:
8901
diff
changeset
|
56 #if LIBAVCODEC_VERSION_MAJOR < 53 |
8870
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8864
diff
changeset
|
57 unsigned int display_flags; ///< 1, 2 or 1+2 fields for XvMCPutSurface |
8903
9f1f4704d89c
Drop struct members display_flags and state with the next major version bump.
diego
parents:
8901
diff
changeset
|
58 #endif |
8852 | 59 //}@ |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
60 |
8853
b0292c878f9d
clarify xvmc struct fields usage distribution (internal communication)
iive
parents:
8852
diff
changeset
|
61 /** modified by calling application and the decoder */ |
8852 | 62 //@{ |
8854 | 63 int start_mv_blocks_num; ///< offset in the array for the current slice, updated by vo |
64 int filled_mv_blocks_num; ///< processed mv block in this slice, changed by decoder | |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
65 |
8854 | 66 int next_free_data_block_num; ///< used in add_mv_block, pointer to next free block |
8852 | 67 //}@ |
8900 | 68 /** extensions may be placed here */ |
8898 | 69 #if LIBAVCODEC_VERSION_MAJOR < 53 |
8852 | 70 //@{ |
8906
23f3b98db75c
Move the state field in the xvmc struct to the extensions section.
iive
parents:
8903
diff
changeset
|
71 int state; ///< 0 - free, 1 - waiting to display, 2 - waiting for prediction |
8854 | 72 void* p_osd_target_surface_render; ///< pointer to the surface where subpicture is rendered |
8852 | 73 //}@ |
8898 | 74 #endif |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
75 }; |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
76 |
8843 | 77 #endif /* AVCODEC_XVMC_H */ |