Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
a383f226
Commit
a383f226
authored
Aug 17, 2015
by
wm4
Committed by
Ronald S. Bultje
Aug 18, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: move vdpau decoders under FF_API_VDPAU.
Signed-off-by:
Ronald S. Bultje
<
rsbultje@gmail.com
>
parent
030b5a4f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
12 deletions
+22
-12
allcodecs.c
libavcodec/allcodecs.c
+10
-0
h264.c
libavcodec/h264.c
+1
-1
mpeg12dec.c
libavcodec/mpeg12dec.c
+4
-4
mpeg4videodec.c
libavcodec/mpeg4videodec.c
+1
-1
vc1dec.c
libavcodec/vc1dec.c
+2
-2
vdpau.c
libavcodec/vdpau.c
+4
-4
No files found.
libavcodec/allcodecs.c
View file @
a383f226
...
@@ -190,7 +190,9 @@ void avcodec_register_all(void)
...
@@ -190,7 +190,9 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
H264_MMAL
,
h264_mmal
);
REGISTER_DECODER
(
H264_MMAL
,
h264_mmal
);
REGISTER_DECODER
(
H264_QSV
,
h264_qsv
);
REGISTER_DECODER
(
H264_QSV
,
h264_qsv
);
REGISTER_DECODER
(
H264_VDA
,
h264_vda
);
REGISTER_DECODER
(
H264_VDA
,
h264_vda
);
#if FF_API_VDPAU
REGISTER_DECODER
(
H264_VDPAU
,
h264_vdpau
);
REGISTER_DECODER
(
H264_VDPAU
,
h264_vdpau
);
#endif
REGISTER_ENCDEC
(
HAP
,
hap
);
REGISTER_ENCDEC
(
HAP
,
hap
);
REGISTER_DECODER
(
HEVC
,
hevc
);
REGISTER_DECODER
(
HEVC
,
hevc
);
REGISTER_DECODER
(
HEVC_QSV
,
hevc_qsv
);
REGISTER_DECODER
(
HEVC_QSV
,
hevc_qsv
);
...
@@ -227,10 +229,14 @@ void avcodec_register_all(void)
...
@@ -227,10 +229,14 @@ void avcodec_register_all(void)
REGISTER_ENCDEC
(
MPEG2VIDEO
,
mpeg2video
);
REGISTER_ENCDEC
(
MPEG2VIDEO
,
mpeg2video
);
REGISTER_ENCDEC
(
MPEG4
,
mpeg4
);
REGISTER_ENCDEC
(
MPEG4
,
mpeg4
);
REGISTER_DECODER
(
MPEG4_CRYSTALHD
,
mpeg4_crystalhd
);
REGISTER_DECODER
(
MPEG4_CRYSTALHD
,
mpeg4_crystalhd
);
#if FF_API_VDPAU
REGISTER_DECODER
(
MPEG4_VDPAU
,
mpeg4_vdpau
);
REGISTER_DECODER
(
MPEG4_VDPAU
,
mpeg4_vdpau
);
#endif
REGISTER_DECODER
(
MPEGVIDEO
,
mpegvideo
);
REGISTER_DECODER
(
MPEGVIDEO
,
mpegvideo
);
#if FF_API_VDPAU
REGISTER_DECODER
(
MPEG_VDPAU
,
mpeg_vdpau
);
REGISTER_DECODER
(
MPEG_VDPAU
,
mpeg_vdpau
);
REGISTER_DECODER
(
MPEG1_VDPAU
,
mpeg1_vdpau
);
REGISTER_DECODER
(
MPEG1_VDPAU
,
mpeg1_vdpau
);
#endif
REGISTER_DECODER
(
MPEG2_CRYSTALHD
,
mpeg2_crystalhd
);
REGISTER_DECODER
(
MPEG2_CRYSTALHD
,
mpeg2_crystalhd
);
REGISTER_DECODER
(
MPEG2_QSV
,
mpeg2_qsv
);
REGISTER_DECODER
(
MPEG2_QSV
,
mpeg2_qsv
);
REGISTER_DECODER
(
MSA1
,
msa1
);
REGISTER_DECODER
(
MSA1
,
msa1
);
...
@@ -311,7 +317,9 @@ void avcodec_register_all(void)
...
@@ -311,7 +317,9 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
VBLE
,
vble
);
REGISTER_DECODER
(
VBLE
,
vble
);
REGISTER_DECODER
(
VC1
,
vc1
);
REGISTER_DECODER
(
VC1
,
vc1
);
REGISTER_DECODER
(
VC1_CRYSTALHD
,
vc1_crystalhd
);
REGISTER_DECODER
(
VC1_CRYSTALHD
,
vc1_crystalhd
);
#if FF_API_VDPAU
REGISTER_DECODER
(
VC1_VDPAU
,
vc1_vdpau
);
REGISTER_DECODER
(
VC1_VDPAU
,
vc1_vdpau
);
#endif
REGISTER_DECODER
(
VC1IMAGE
,
vc1image
);
REGISTER_DECODER
(
VC1IMAGE
,
vc1image
);
REGISTER_DECODER
(
VC1_QSV
,
vc1_qsv
);
REGISTER_DECODER
(
VC1_QSV
,
vc1_qsv
);
REGISTER_DECODER
(
VCR1
,
vcr1
);
REGISTER_DECODER
(
VCR1
,
vcr1
);
...
@@ -331,7 +339,9 @@ void avcodec_register_all(void)
...
@@ -331,7 +339,9 @@ void avcodec_register_all(void)
REGISTER_ENCDEC
(
WMV2
,
wmv2
);
REGISTER_ENCDEC
(
WMV2
,
wmv2
);
REGISTER_DECODER
(
WMV3
,
wmv3
);
REGISTER_DECODER
(
WMV3
,
wmv3
);
REGISTER_DECODER
(
WMV3_CRYSTALHD
,
wmv3_crystalhd
);
REGISTER_DECODER
(
WMV3_CRYSTALHD
,
wmv3_crystalhd
);
#if FF_API_VDPAU
REGISTER_DECODER
(
WMV3_VDPAU
,
wmv3_vdpau
);
REGISTER_DECODER
(
WMV3_VDPAU
,
wmv3_vdpau
);
#endif
REGISTER_DECODER
(
WMV3IMAGE
,
wmv3image
);
REGISTER_DECODER
(
WMV3IMAGE
,
wmv3image
);
REGISTER_DECODER
(
WNV1
,
wnv1
);
REGISTER_DECODER
(
WNV1
,
wnv1
);
REGISTER_DECODER
(
XAN_WC3
,
xan_wc3
);
REGISTER_DECODER
(
XAN_WC3
,
xan_wc3
);
...
...
libavcodec/h264.c
View file @
a383f226
...
@@ -1996,7 +1996,7 @@ AVCodec ff_h264_decoder = {
...
@@ -1996,7 +1996,7 @@ AVCodec ff_h264_decoder = {
.
priv_class
=
&
h264_class
,
.
priv_class
=
&
h264_class
,
};
};
#if CONFIG_H264_VDPAU_DECODER
#if CONFIG_H264_VDPAU_DECODER
&& FF_API_VDPAU
static
const
AVClass
h264_vdpau_class
=
{
static
const
AVClass
h264_vdpau_class
=
{
.
class_name
=
"H264 VDPAU Decoder"
,
.
class_name
=
"H264 VDPAU Decoder"
,
.
item_name
=
av_default_item_name
,
.
item_name
=
av_default_item_name
,
...
...
libavcodec/mpeg12dec.c
View file @
a383f226
...
@@ -1186,7 +1186,7 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
...
@@ -1186,7 +1186,7 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = {
#if CONFIG_MPEG1_XVMC_HWACCEL
#if CONFIG_MPEG1_XVMC_HWACCEL
AV_PIX_FMT_XVMC
,
AV_PIX_FMT_XVMC
,
#endif
#endif
#if CONFIG_MPEG1_VDPAU_DECODER
#if CONFIG_MPEG1_VDPAU_DECODER
&& FF_API_VDPAU
AV_PIX_FMT_VDPAU_MPEG1
,
AV_PIX_FMT_VDPAU_MPEG1
,
#endif
#endif
#if CONFIG_MPEG1_VDPAU_HWACCEL
#if CONFIG_MPEG1_VDPAU_HWACCEL
...
@@ -1200,7 +1200,7 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
...
@@ -1200,7 +1200,7 @@ static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = {
#if CONFIG_MPEG2_XVMC_HWACCEL
#if CONFIG_MPEG2_XVMC_HWACCEL
AV_PIX_FMT_XVMC
,
AV_PIX_FMT_XVMC
,
#endif
#endif
#if CONFIG_MPEG_VDPAU_DECODER
#if CONFIG_MPEG_VDPAU_DECODER
&& FF_API_VDPAU
AV_PIX_FMT_VDPAU_MPEG2
,
AV_PIX_FMT_VDPAU_MPEG2
,
#endif
#endif
#if CONFIG_MPEG2_VDPAU_HWACCEL
#if CONFIG_MPEG2_VDPAU_HWACCEL
...
@@ -2954,7 +2954,7 @@ AVCodec ff_mpeg_xvmc_decoder = {
...
@@ -2954,7 +2954,7 @@ AVCodec ff_mpeg_xvmc_decoder = {
#endif
#endif
#endif
/* FF_API_XVMC */
#endif
/* FF_API_XVMC */
#if CONFIG_MPEG_VDPAU_DECODER
#if CONFIG_MPEG_VDPAU_DECODER
&& FF_API_VDPAU
AVCodec
ff_mpeg_vdpau_decoder
=
{
AVCodec
ff_mpeg_vdpau_decoder
=
{
.
name
=
"mpegvideo_vdpau"
,
.
name
=
"mpegvideo_vdpau"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1/2 video (VDPAU acceleration)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1/2 video (VDPAU acceleration)"
),
...
@@ -2970,7 +2970,7 @@ AVCodec ff_mpeg_vdpau_decoder = {
...
@@ -2970,7 +2970,7 @@ AVCodec ff_mpeg_vdpau_decoder = {
};
};
#endif
#endif
#if CONFIG_MPEG1_VDPAU_DECODER
#if CONFIG_MPEG1_VDPAU_DECODER
&& FF_API_VDPAU
AVCodec
ff_mpeg1_vdpau_decoder
=
{
AVCodec
ff_mpeg1_vdpau_decoder
=
{
.
name
=
"mpeg1video_vdpau"
,
.
name
=
"mpeg1video_vdpau"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1 video (VDPAU acceleration)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1 video (VDPAU acceleration)"
),
...
...
libavcodec/mpeg4videodec.c
View file @
a383f226
...
@@ -2789,7 +2789,7 @@ AVCodec ff_mpeg4_decoder = {
...
@@ -2789,7 +2789,7 @@ AVCodec ff_mpeg4_decoder = {
};
};
#if CONFIG_MPEG4_VDPAU_DECODER
#if CONFIG_MPEG4_VDPAU_DECODER
&& FF_API_VDPAU
static
const
AVClass
mpeg4_vdpau_class
=
{
static
const
AVClass
mpeg4_vdpau_class
=
{
"MPEG4 Video VDPAU Decoder"
,
"MPEG4 Video VDPAU Decoder"
,
av_default_item_name
,
av_default_item_name
,
...
...
libavcodec/vc1dec.c
View file @
a383f226
...
@@ -1156,7 +1156,7 @@ AVCodec ff_wmv3_decoder = {
...
@@ -1156,7 +1156,7 @@ AVCodec ff_wmv3_decoder = {
};
};
#endif
#endif
#if CONFIG_WMV3_VDPAU_DECODER
#if CONFIG_WMV3_VDPAU_DECODER
&& FF_API_VDPAU
AVCodec
ff_wmv3_vdpau_decoder
=
{
AVCodec
ff_wmv3_vdpau_decoder
=
{
.
name
=
"wmv3_vdpau"
,
.
name
=
"wmv3_vdpau"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Windows Media Video 9 VDPAU"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Windows Media Video 9 VDPAU"
),
...
@@ -1172,7 +1172,7 @@ AVCodec ff_wmv3_vdpau_decoder = {
...
@@ -1172,7 +1172,7 @@ AVCodec ff_wmv3_vdpau_decoder = {
};
};
#endif
#endif
#if CONFIG_VC1_VDPAU_DECODER
#if CONFIG_VC1_VDPAU_DECODER
&& FF_API_VDPAU
AVCodec
ff_vc1_vdpau_decoder
=
{
AVCodec
ff_vc1_vdpau_decoder
=
{
.
name
=
"vc1_vdpau"
,
.
name
=
"vc1_vdpau"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SMPTE VC-1 VDPAU"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SMPTE VC-1 VDPAU"
),
...
...
libavcodec/vdpau.c
View file @
a383f226
...
@@ -358,6 +358,7 @@ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx,
...
@@ -358,6 +358,7 @@ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx,
/* Obsolete non-hwaccel VDPAU support below... */
/* Obsolete non-hwaccel VDPAU support below... */
#if CONFIG_H264_VDPAU_DECODER && FF_API_VDPAU
void
ff_vdpau_h264_set_reference_frames
(
H264Context
*
h
)
void
ff_vdpau_h264_set_reference_frames
(
H264Context
*
h
)
{
{
struct
vdpau_render_state
*
render
,
*
render_ref
;
struct
vdpau_render_state
*
render
,
*
render_ref
;
...
@@ -443,7 +444,6 @@ void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf, int buf_size)
...
@@ -443,7 +444,6 @@ void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf, int buf_size)
render
->
bitstream_buffers_used
++
;
render
->
bitstream_buffers_used
++
;
}
}
#if CONFIG_H264_VDPAU_DECODER
void
ff_vdpau_h264_picture_start
(
H264Context
*
h
)
void
ff_vdpau_h264_picture_start
(
H264Context
*
h
)
{
{
struct
vdpau_render_state
*
render
;
struct
vdpau_render_state
*
render
;
...
@@ -506,7 +506,7 @@ void ff_vdpau_h264_picture_complete(H264Context *h)
...
@@ -506,7 +506,7 @@ void ff_vdpau_h264_picture_complete(H264Context *h)
}
}
#endif
/* CONFIG_H264_VDPAU_DECODER */
#endif
/* CONFIG_H264_VDPAU_DECODER */
#if
CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER
#if
(CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER) && FF_API_VDPAU
void
ff_vdpau_mpeg_picture_complete
(
MpegEncContext
*
s
,
const
uint8_t
*
buf
,
void
ff_vdpau_mpeg_picture_complete
(
MpegEncContext
*
s
,
const
uint8_t
*
buf
,
int
buf_size
,
int
slice_count
)
int
buf_size
,
int
slice_count
)
{
{
...
@@ -565,7 +565,7 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
...
@@ -565,7 +565,7 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
}
}
#endif
/* CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER */
#endif
/* CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER */
#if CONFIG_VC1_VDPAU_DECODER
#if CONFIG_VC1_VDPAU_DECODER
&& FF_API_VDPAU
void
ff_vdpau_vc1_decode_picture
(
MpegEncContext
*
s
,
const
uint8_t
*
buf
,
void
ff_vdpau_vc1_decode_picture
(
MpegEncContext
*
s
,
const
uint8_t
*
buf
,
int
buf_size
)
int
buf_size
)
{
{
...
@@ -636,7 +636,7 @@ void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
...
@@ -636,7 +636,7 @@ void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
}
}
#endif
/* (CONFIG_VC1_VDPAU_DECODER */
#endif
/* (CONFIG_VC1_VDPAU_DECODER */
#if CONFIG_MPEG4_VDPAU_DECODER
#if CONFIG_MPEG4_VDPAU_DECODER
&& FF_API_VDPAU
void
ff_vdpau_mpeg4_decode_picture
(
Mpeg4DecContext
*
ctx
,
const
uint8_t
*
buf
,
void
ff_vdpau_mpeg4_decode_picture
(
Mpeg4DecContext
*
ctx
,
const
uint8_t
*
buf
,
int
buf_size
)
int
buf_size
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment