Mercurial > libavcodec.hg
annotate xvmc.h @ 8917:422a9dbebb53 libavcodec
Almost cosmetics.
Move some assignments after the checks.
author | iive |
---|---|
date | Sun, 15 Feb 2009 10:14:16 +0000 |
parents | 20da0a97b95f |
children | b42265a3f170 |
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 |
8908
ac0ad123e3f0
Remove obsolete display_flags member from xvmc struct
iive
parents:
8907
diff
changeset
|
28 #if LIBAVCODEC_VERSION_MAJOR < 53 |
8854 | 29 #define AV_XVMC_STATE_DISPLAY_PENDING 1 /** the surface should be shown, the video driver manipulates this */ |
30 #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */ | |
31 #define AV_XVMC_STATE_OSD_SOURCE 4 /** this surface is needed for subpicture rendering */ | |
8908
ac0ad123e3f0
Remove obsolete display_flags member from xvmc struct
iive
parents:
8907
diff
changeset
|
32 #endif |
8854 | 33 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */ |
8913 | 34 // 1337 IDCT MCo |
8846 | 35 |
8914
20da0a97b95f
Rename xvmc_render_state to something with pixfmt in its name.
iive
parents:
8913
diff
changeset
|
36 struct xvmc_pixfmt_render { |
8913 | 37 /** Set by calling application |
38 Once set these values are not supposed to be modified. | |
39 */ | |
8852 | 40 //@{ |
8910
a11771712f48
Give a little better name to the magic(_id) field in xvmc struct
iive
parents:
8908
diff
changeset
|
41 int magic_id; ///< used as a check against memory corruption by regular pixel routines or other API structure |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
42 |
8850 | 43 short* data_blocks; |
44 XvMCMacroBlock* mv_blocks; | |
45 int total_number_of_mv_blocks; | |
46 int total_number_of_data_blocks; | |
8854 | 47 int idct; ///< indicate that IDCT acceleration level is used |
48 int unsigned_intra; ///< +-128 for intra pictures after clipping | |
49 XvMCSurface* p_surface; ///< pointer to rendered surface, never changed | |
8852 | 50 //}@ |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
51 |
8913 | 52 /** Set by the decoder before calling draw_horiz_band() |
53 need by the XvMCRenderSurface function */ | |
8852 | 54 //@{ |
8854 | 55 XvMCSurface* p_past_surface; ///< pointer to the past surface |
56 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
|
57 |
8913 | 58 unsigned int picture_structure; ///< top/bottom field or frame |
8854 | 59 unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence |
8852 | 60 //}@ |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
61 |
8907
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
62 /** Offset in the mv array for the current slice: |
8913 | 63 - application - zeros it on get_buffer(). |
8907
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
64 successful draw_horiz_band() may increment it |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
65 with filled_mb_block_num or zero both. |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
66 - libavcodec - unchanged |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
67 */ |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
68 int start_mv_blocks_num; |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
69 |
8907
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
70 /** Processed mv blocks in this slice: |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
71 - application - zeros it on get_buffer() or after successful draw_horiz_band() |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
72 - libavcodec - increment with one of each stored MB |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
73 */ |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
74 int filled_mv_blocks_num; |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
75 |
8913 | 76 /** Offset to the next free data block. The mv_blocks hold number pointing to the data blocks. |
8907
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
77 - application - zeroes it on get_buffer() and after successful draw_horiz_band() |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
78 - libvcodec - each macroblock increases it with the number of coded blocks in it. |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
79 */ |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
80 int next_free_data_block_num; |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
81 |
8900 | 82 /** extensions may be placed here */ |
8898 | 83 #if LIBAVCODEC_VERSION_MAJOR < 53 |
8852 | 84 //@{ |
8913 | 85 /** State - used to workaround limitations in MPlayer video system. |
86 0 - Surface not used | |
87 1 - Surface is still hold in application to be displayed or is still visible. | |
88 2 - Surface is still hold in libavcodec buffer for prediction | |
8907
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
89 */ |
c9e8aed08d17
Detailed description of the interesting fields in xvmc struct.
iive
parents:
8906
diff
changeset
|
90 int state; |
8854 | 91 void* p_osd_target_surface_render; ///< pointer to the surface where subpicture is rendered |
8852 | 92 //}@ |
8898 | 93 #endif |
8808
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
94 }; |
36f2dabd58c9
Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as
diego
parents:
diff
changeset
|
95 |
8843 | 96 #endif /* AVCODEC_XVMC_H */ |