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
3f111804
Commit
3f111804
authored
Dec 30, 2012
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvpx: make vp8 and vp9 selectable
Support older libvpx versions.
parent
dab1f543
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
32 deletions
+44
-32
configure
configure
+10
-6
Makefile
libavcodec/Makefile
+4
-2
allcodecs.c
libavcodec/allcodecs.c
+2
-2
libvpxdec.c
libavcodec/libvpxdec.c
+10
-6
libvpxenc.c
libavcodec/libvpxenc.c
+18
-16
No files found.
configure
View file @
3f111804
...
...
@@ -197,7 +197,7 @@ External library support:
--enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no]
--enable-libvo-amrwbenc enable AMR-WB encoding via libvo-amrwbenc [no]
--enable-libvorbis enable Vorbis encoding via libvorbis [no]
--enable-libvpx enable VP8 de/encoding via libvpx [no]
--enable-libvpx enable VP8
and VP9
de/encoding via libvpx [no]
--enable-libx264 enable H.264 encoding via x264 [no]
--enable-libxavs enable AVS encoding via xavs [no]
--enable-libxvid enable Xvid encoding via xvidcore,
...
...
@@ -1660,8 +1660,10 @@ libtheora_encoder_deps="libtheora"
libvo_aacenc_encoder_deps
=
"libvo_aacenc"
libvo_amrwbenc_encoder_deps
=
"libvo_amrwbenc"
libvorbis_encoder_deps
=
"libvorbis"
libvpx_decoder_deps
=
"libvpx"
libvpx_encoder_deps
=
"libvpx"
libvpx_vp8_decoder_deps
=
"libvpx"
libvpx_vp8_encoder_deps
=
"libvpx"
libvpx_vp9_decoder_deps
=
"libvpx"
libvpx_vp9_encoder_deps
=
"libvpx"
libx264_encoder_deps
=
"libx264"
libxavs_encoder_deps
=
"libxavs"
libxvid_encoder_deps
=
"libxvid"
...
...
@@ -3485,10 +3487,12 @@ enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -l
enabled libvo_amrwbenc
&&
require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init
-lvo-amrwbenc
enabled libvorbis
&&
require libvorbis vorbis/vorbisenc.h vorbis_info_init
-lvorbisenc
-lvorbis
-logg
enabled libvpx
&&
{
enabled libvpx_decoder
&&
{
check_lib2
"vpx/vpx_decoder.h vpx/vp8dx.h"
vpx_codec_dec_init_ver
-lvpx
||
enabled libvpx_
vp8_
decoder
&&
{
check_lib2
"vpx/vpx_decoder.h vpx/vp8dx.h"
vpx_codec_dec_init_ver
-lvpx
||
die
"ERROR: libvpx decoder version must be >=0.9.1"
;
}
enabled libvpx_encoder
&&
{
check_lib2
"vpx/vpx_encoder.h vpx/vp8cx.h"
"vpx_codec_enc_init_ver VPX_CQ"
-lvpx
||
die
"ERROR: libvpx encoder version must be >=0.9.6"
;
}
}
enabled libvpx_vp8_encoder
&&
{
check_lib2
"vpx/vpx_encoder.h vpx/vp8cx.h"
"vpx_codec_enc_init_ver VPX_CQ"
-lvpx
||
die
"ERROR: libvpx encoder version must be >=0.9.6"
;
}
enabled libvpx_vp9_decoder
&&
{
check_lib2
"vpx/vpx_decoder.h vpx/vp8dx.h"
"vpx_codec_vp9_dx"
-lvpx
||
disable libvpx_vp9_decoder
;
}
enabled libvpx_vp9_encoder
&&
{
check_lib2
"vpx/vpx_encoder.h vpx/vp8cx.h"
"vpx_codec_vp9_cx"
-lvpx
||
disable libvpx_vp9_encoder
;
}
}
enabled libx264
&&
require libx264 x264.h x264_encoder_encode
-lx264
&&
{
check_cpp_condition x264.h
"X264_BUILD >= 118"
||
die
"ERROR: libx264 version must be >= 0.118."
;
}
...
...
libavcodec/Makefile
View file @
3f111804
...
...
@@ -594,8 +594,10 @@ OBJS-$(CONFIG_LIBVO_AACENC_ENCODER) += libvo-aacenc.o mpeg4audio.o
OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER)
+=
libvo-amrwbenc.o
OBJS-$(CONFIG_LIBVORBIS_ENCODER)
+=
libvorbis.o
audio_frame_queue.o
\
vorbis_data.o
vorbis_parser.o
OBJS-$(CONFIG_LIBVPX_DECODER)
+=
libvpxdec.o
OBJS-$(CONFIG_LIBVPX_ENCODER)
+=
libvpxenc.o
OBJS-$(CONFIG_LIBVPX_VP8_DECODER)
+=
libvpxdec.o
OBJS-$(CONFIG_LIBVPX_VP8_ENCODER)
+=
libvpxenc.o
OBJS-$(CONFIG_LIBVPX_VP9_DECODER)
+=
libvpxdec.o
OBJS-$(CONFIG_LIBVPX_VP9_ENCODER)
+=
libvpxenc.o
OBJS-$(CONFIG_LIBX264_ENCODER)
+=
libx264.o
OBJS-$(CONFIG_LIBXAVS_ENCODER)
+=
libxavs.o
OBJS-$(CONFIG_LIBXVID_ENCODER)
+=
libxvid.o
...
...
libavcodec/allcodecs.c
View file @
3f111804
...
...
@@ -426,8 +426,8 @@ void avcodec_register_all(void)
REGISTER_ENCODER
(
LIBVO_AACENC
,
libvo_aacenc
);
REGISTER_ENCODER
(
LIBVO_AMRWBENC
,
libvo_amrwbenc
);
REGISTER_ENCODER
(
LIBVORBIS
,
libvorbis
);
REGISTER_ENCDEC
(
LIBVPX
,
libvpx
);
REGISTER_ENCDEC
(
LIBVPX
,
libvpx_vp9
);
REGISTER_ENCDEC
(
LIBVPX
_VP8
,
libvpx_vp8
);
REGISTER_ENCDEC
(
LIBVPX
_VP9
,
libvpx_vp9
);
REGISTER_ENCODER
(
LIBX264
,
libx264
);
REGISTER_ENCODER
(
LIBXAVS
,
libxavs
);
REGISTER_ENCODER
(
LIBXVID
,
libxvid
);
...
...
libavcodec/libvpxdec.c
View file @
3f111804
...
...
@@ -58,11 +58,6 @@ static av_cold int vpx_init(AVCodecContext *avctx,
return
0
;
}
static
av_cold
int
vp8_init
(
AVCodecContext
*
avctx
)
{
return
vpx_init
(
avctx
,
&
vpx_codec_vp8_dx_algo
);
}
static
int
vp8_decode
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame
,
AVPacket
*
avpkt
)
{
...
...
@@ -117,7 +112,13 @@ static av_cold int vp8_free(AVCodecContext *avctx)
return
0
;
}
AVCodec
ff_libvpx_decoder
=
{
#if CONFIG_LIBVPX_VP8_DECODER
static
av_cold
int
vp8_init
(
AVCodecContext
*
avctx
)
{
return
vpx_init
(
avctx
,
&
vpx_codec_vp8_dx_algo
);
}
AVCodec
ff_libvpx_vp8_decoder
=
{
.
name
=
"libvpx"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_VP8
,
...
...
@@ -128,7 +129,9 @@ AVCodec ff_libvpx_decoder = {
.
capabilities
=
CODEC_CAP_AUTO_THREADS
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libvpx VP8"
),
};
#endif
/* CONFIG_LIBVPX_VP8_DECODER */
#if CONFIG_LIBVPX_VP9_DECODER
static
av_cold
int
vp9_init
(
AVCodecContext
*
avctx
)
{
return
vpx_init
(
avctx
,
&
vpx_codec_vp9_dx_algo
);
...
...
@@ -145,3 +148,4 @@ AVCodec ff_libvpx_vp9_decoder = {
.
capabilities
=
CODEC_CAP_AUTO_THREADS
|
CODEC_CAP_EXPERIMENTAL
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libvpx VP9"
),
};
#endif
/* CONFIG_LIBVPX_VP9_DECODER */
libavcodec/libvpxenc.c
View file @
3f111804
...
...
@@ -362,11 +362,6 @@ static av_cold int vpx_init(AVCodecContext *avctx,
return
0
;
}
static
av_cold
int
vp8_init
(
AVCodecContext
*
avctx
)
{
return
vpx_init
(
avctx
,
&
vpx_codec_vp8_cx_algo
);
}
static
inline
void
cx_pktcpy
(
struct
FrameListData
*
dst
,
const
struct
vpx_codec_cx_pkt
*
src
)
{
...
...
@@ -570,13 +565,6 @@ static const AVOption options[] = {
{
NULL
}
};
static
const
AVClass
class
=
{
.
class_name
=
"libvpx encoder"
,
.
item_name
=
av_default_item_name
,
.
option
=
options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
};
static
const
AVCodecDefault
defaults
[]
=
{
{
"qmin"
,
"-1"
},
{
"qmax"
,
"-1"
},
...
...
@@ -585,7 +573,20 @@ static const AVCodecDefault defaults[] = {
{
NULL
},
};
AVCodec
ff_libvpx_encoder
=
{
#if CONFIG_LIBVPX_VP8_ENCODER
static
av_cold
int
vp8_init
(
AVCodecContext
*
avctx
)
{
return
vpx_init
(
avctx
,
&
vpx_codec_vp8_cx_algo
);
}
static
const
AVClass
class_vp8
=
{
.
class_name
=
"libvpx encoder"
,
.
item_name
=
av_default_item_name
,
.
option
=
options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
};
AVCodec
ff_libvpx_vp8_encoder
=
{
.
name
=
"libvpx"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_VP8
,
...
...
@@ -596,11 +597,12 @@ AVCodec ff_libvpx_encoder = {
.
capabilities
=
CODEC_CAP_DELAY
|
CODEC_CAP_AUTO_THREADS
,
.
pix_fmts
=
(
const
enum
AVPixelFormat
[]){
AV_PIX_FMT_YUV420P
,
AV_PIX_FMT_NONE
},
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libvpx VP8"
),
.
priv_class
=
&
class
,
.
priv_class
=
&
class
_vp8
,
.
defaults
=
defaults
,
};
#endif
/* CONFIG_LIBVPX_VP8_ENCODER */
#if CONFIG_LIBVPX_VP9_ENCODER
static
av_cold
int
vp9_init
(
AVCodecContext
*
avctx
)
{
return
vpx_init
(
avctx
,
&
vpx_codec_vp9_cx_algo
);
...
...
@@ -613,7 +615,6 @@ static const AVClass class_vp9 = {
.
version
=
LIBAVUTIL_VERSION_INT
,
};
AVCodec
ff_libvpx_vp9_encoder
=
{
.
name
=
"libvpx-vp9"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
...
...
@@ -628,3 +629,4 @@ AVCodec ff_libvpx_vp9_encoder = {
.
priv_class
=
&
class_vp9
,
.
defaults
=
defaults
,
};
#endif
/* CONFIG_LIBVPX_VP9_ENCODER */
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