Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
7671dd7c
Commit
7671dd7c
authored
Nov 03, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: add support for VDPAU decoding
parent
07fd0a22
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
365 additions
and
3 deletions
+365
-3
Changelog
Changelog
+1
-0
Makefile
Makefile
+4
-1
avconv.h
avconv.h
+3
-0
avconv_opt.c
avconv_opt.c
+3
-0
avconv_vdpau.c
avconv_vdpau.c
+335
-0
configure
configure
+10
-2
avconv.texi
doc/avconv.texi
+9
-0
No files found.
Changelog
View file @
7671dd7c
...
@@ -48,6 +48,7 @@ version 10:
...
@@ -48,6 +48,7 @@ version 10:
- setsar/setdar filters now support variables in ratio expressions
- setsar/setdar filters now support variables in ratio expressions
- dar variable in the scale filter now returns the actual DAR (i.e. a * sar)
- dar variable in the scale filter now returns the actual DAR (i.e. a * sar)
- VP9 decoder
- VP9 decoder
- support for decoding through VDPAU in avconv (the -hwaccel option)
version 9:
version 9:
...
...
Makefile
View file @
7671dd7c
...
@@ -62,7 +62,10 @@ PROGS-$(CONFIG_AVPROBE) += avprobe
...
@@ -62,7 +62,10 @@ PROGS-$(CONFIG_AVPROBE) += avprobe
PROGS-$(CONFIG_AVSERVER)
+=
avserver
PROGS-$(CONFIG_AVSERVER)
+=
avserver
PROGS
:=
$
(
PROGS-yes:%
=
%
$(EXESUF)
)
PROGS
:=
$
(
PROGS-yes:%
=
%
$(EXESUF)
)
OBJS-avconv
=
avconv_opt.o avconv_filter.o
OBJS-avconv
=
avconv_opt.o avconv_filter.o
OBJS-avconv-$(HAVE_VDPAU_X11)
+=
avconv_vdpau.o
TESTTOOLS
=
audiogen videogen rotozoom tiny_psnr
base64
TESTTOOLS
=
audiogen videogen rotozoom tiny_psnr
base64
HOSTPROGS
:=
$
(
TESTTOOLS:%
=
tests/%
)
doc/print_options
HOSTPROGS
:=
$
(
TESTTOOLS:%
=
tests/%
)
doc/print_options
TOOLS
=
qt-faststart trasher
TOOLS
=
qt-faststart trasher
...
@@ -126,7 +129,7 @@ endef
...
@@ -126,7 +129,7 @@ endef
$(foreach
D,$(FFLIBS),$(eval
$(call
DOSUBDIR,lib$(D))))
$(foreach
D,$(FFLIBS),$(eval
$(call
DOSUBDIR,lib$(D))))
define
DOPROG
define
DOPROG
OBJS-$(1)
+=
$(1).o
cmdutils.o
$(EXEOBJS)
OBJS-$(1)
+=
$(1).o
cmdutils.o
$(EXEOBJS)
$(OBJS-$(1)-yes)
$(1)$(EXESUF)
:
$$(OBJS-$(1))
$(1)$(EXESUF)
:
$$(OBJS-$(1))
$$(OBJS-$(1))
:
CFLAGS += $(CFLAGS-$(1))
$$(OBJS-$(1))
:
CFLAGS += $(CFLAGS-$(1))
$(1)$(EXESUF)
:
LDFLAGS += $(LDFLAGS-$(1))
$(1)$(EXESUF)
:
LDFLAGS += $(LDFLAGS-$(1))
...
...
avconv.h
View file @
7671dd7c
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
enum
HWAccelID
{
enum
HWAccelID
{
HWACCEL_NONE
=
0
,
HWACCEL_NONE
=
0
,
HWACCEL_AUTO
,
HWACCEL_AUTO
,
HWACCEL_VDPAU
,
};
};
typedef
struct
HWAccel
{
typedef
struct
HWAccel
{
...
@@ -402,4 +403,6 @@ FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);
...
@@ -402,4 +403,6 @@ FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);
int
avconv_parse_options
(
int
argc
,
char
**
argv
);
int
avconv_parse_options
(
int
argc
,
char
**
argv
);
int
vdpau_init
(
AVCodecContext
*
s
);
#endif
/* AVCONV_H */
#endif
/* AVCONV_H */
avconv_opt.c
View file @
7671dd7c
...
@@ -54,6 +54,9 @@
...
@@ -54,6 +54,9 @@
}
}
const
HWAccel
hwaccels
[]
=
{
const
HWAccel
hwaccels
[]
=
{
#if HAVE_VDPAU_X11
{
"vdpau"
,
vdpau_init
,
HWACCEL_VDPAU
,
AV_PIX_FMT_VDPAU
},
#endif
{
0
},
{
0
},
};
};
...
...
avconv_vdpau.c
0 → 100644
View file @
7671dd7c
This diff is collapsed.
Click to expand it.
configure
View file @
7671dd7c
...
@@ -1367,11 +1367,13 @@ HAVE_LIST="
...
@@ -1367,11 +1367,13 @@ HAVE_LIST="
threads
threads
unistd_h
unistd_h
usleep
usleep
vdpau_x11
vfp_args
vfp_args
VirtualAlloc
VirtualAlloc
windows_h
windows_h
winsock2_h
winsock2_h
xform_asm
xform_asm
xlib
xmm_clobbers
xmm_clobbers
"
"
...
@@ -3906,15 +3908,21 @@ if enabled libcdio; then
...
@@ -3906,15 +3908,21 @@ if enabled libcdio; then
check_lib2
"cdio/paranoia/cdda.h cdio/paranoia/paranoia.h"
cdio_cddap_open
-lcdio_paranoia
-lcdio_cdda
-lcdio
check_lib2
"cdio/paranoia/cdda.h cdio/paranoia/paranoia.h"
cdio_cddap_open
-lcdio_paranoia
-lcdio_cdda
-lcdio
fi
fi
check_lib X11/Xlib.h XOpenDisplay
-lX11
&&
enable
xlib
enabled x11grab
&&
enabled x11grab
&&
require X11 X11/Xlib.h XOpenDisplay
-lX11
&&
require Xext X11/extensions/XShm.h XShmCreateImage
-lXext
&&
require Xext X11/extensions/XShm.h XShmCreateImage
-lXext
&&
require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage
-lXfixes
require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage
-lXfixes
&&
{
enabled xlib
||
die
"ERROR: Xlib not found"
;
}
enabled vdpau
&&
enabled vdpau
&&
check_cpp_condition vdpau/vdpau.h
"defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP"
||
check_cpp_condition vdpau/vdpau.h
"defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP"
||
disable vdpau
disable vdpau
enabled vdpau
&&
enabled xlib
&&
check_lib2
"vdpau/vdpau.h vdpau/vdpau_x11.h"
vdp_device_create_x11
-lvdpau
&&
enable
vdpau_x11
enabled debug
&&
add_cflags
-g
"
$debuglevel
"
&&
add_asflags
-g
"
$debuglevel
"
enabled debug
&&
add_cflags
-g
"
$debuglevel
"
&&
add_asflags
-g
"
$debuglevel
"
# add some useful compiler flags if supported
# add some useful compiler flags if supported
...
...
doc/avconv.texi
View file @
7671dd7c
...
@@ -562,6 +562,9 @@ Do not use any hardware acceleration (the default).
...
@@ -562,6 +562,9 @@ Do not use any hardware acceleration (the default).
@item auto
@item auto
Automatically select the hardware acceleration method.
Automatically select the hardware acceleration method.
@item vdpau
Use VDPAU (Video Decode and Presentation API for Unix) hardware acceleration.
@end table
@end table
This option has no effect if the selected hwaccel is not available or not
This option has no effect if the selected hwaccel is not available or not
...
@@ -579,6 +582,12 @@ Select a device to use for hardware acceleration.
...
@@ -579,6 +582,12 @@ Select a device to use for hardware acceleration.
This option only makes sense when the @option
{
-hwaccel
}
option is also
This option only makes sense when the @option
{
-hwaccel
}
option is also
specified. Its exact meaning depends on the specific hardware acceleration
specified. Its exact meaning depends on the specific hardware acceleration
method chosen.
method chosen.
@table @option
@item vdpau
For VDPAU, this option specifies the X11 display/screen to use. If this option
is not specified, the value of the @var
{
DISPLAY
}
environment variable is used
@end table
@end table
@end table
@section Audio Options
@section Audio Options
...
...
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