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
d97efd7f
Commit
d97efd7f
authored
Oct 05, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libx264: support 9- and 10-bit output.
parent
4418aa9c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
2 deletions
+37
-2
avcodec.h
libavcodec/avcodec.h
+5
-0
libx264.c
libavcodec/libx264.c
+28
-1
utils.c
libavcodec/utils.c
+3
-0
version.h
libavcodec/version.h
+1
-1
No files found.
libavcodec/avcodec.h
View file @
d97efd7f
...
@@ -2984,6 +2984,11 @@ typedef struct AVCodec {
...
@@ -2984,6 +2984,11 @@ typedef struct AVCodec {
* Private codec-specific defaults.
* Private codec-specific defaults.
*/
*/
const
AVCodecDefault
*
defaults
;
const
AVCodecDefault
*
defaults
;
/**
* Initialize codec static data, called from avcodec_register().
*/
void
(
*
init_static_data
)(
struct
AVCodec
*
codec
);
}
AVCodec
;
}
AVCodec
;
/**
/**
...
...
libavcodec/libx264.c
View file @
d97efd7f
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
*/
*/
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "avcodec.h"
#include "internal.h"
#include "internal.h"
#include <x264.h>
#include <x264.h>
...
@@ -123,6 +124,8 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
...
@@ -123,6 +124,8 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
x264_picture_init
(
&
x4
->
pic
);
x264_picture_init
(
&
x4
->
pic
);
x4
->
pic
.
img
.
i_csp
=
X264_CSP_I420
;
x4
->
pic
.
img
.
i_csp
=
X264_CSP_I420
;
if
(
x264_bit_depth
>
8
)
x4
->
pic
.
img
.
i_csp
|=
X264_CSP_HIGH_DEPTH
;
x4
->
pic
.
img
.
i_plane
=
3
;
x4
->
pic
.
img
.
i_plane
=
3
;
if
(
frame
)
{
if
(
frame
)
{
...
@@ -456,6 +459,30 @@ static av_cold int X264_init(AVCodecContext *avctx)
...
@@ -456,6 +459,30 @@ static av_cold int X264_init(AVCodecContext *avctx)
return
0
;
return
0
;
}
}
static
const
enum
PixelFormat
pix_fmts_8bit
[]
=
{
PIX_FMT_YUV420P
,
PIX_FMT_YUVJ420P
,
PIX_FMT_NONE
};
static
const
enum
PixelFormat
pix_fmts_9bit
[]
=
{
PIX_FMT_YUV420P9
,
PIX_FMT_NONE
};
static
const
enum
PixelFormat
pix_fmts_10bit
[]
=
{
PIX_FMT_YUV420P10
,
PIX_FMT_NONE
};
static
av_cold
void
X264_init_static
(
AVCodec
*
codec
)
{
if
(
x264_bit_depth
==
8
)
codec
->
pix_fmts
=
pix_fmts_8bit
;
else
if
(
x264_bit_depth
==
9
)
codec
->
pix_fmts
=
pix_fmts_9bit
;
else
if
(
x264_bit_depth
==
10
)
codec
->
pix_fmts
=
pix_fmts_10bit
;
}
#define OFFSET(x) offsetof(X264Context, x)
#define OFFSET(x) offsetof(X264Context, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static
const
AVOption
options
[]
=
{
static
const
AVOption
options
[]
=
{
...
@@ -544,8 +571,8 @@ AVCodec ff_libx264_encoder = {
...
@@ -544,8 +571,8 @@ AVCodec ff_libx264_encoder = {
.
encode
=
X264_frame
,
.
encode
=
X264_frame
,
.
close
=
X264_close
,
.
close
=
X264_close
,
.
capabilities
=
CODEC_CAP_DELAY
,
.
capabilities
=
CODEC_CAP_DELAY
,
.
pix_fmts
=
(
const
enum
PixelFormat
[])
{
PIX_FMT_YUV420P
,
PIX_FMT_YUVJ420P
,
PIX_FMT_NONE
},
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"
),
.
priv_class
=
&
class
,
.
priv_class
=
&
class
,
.
defaults
=
x264_defaults
,
.
defaults
=
x264_defaults
,
.
init_static_data
=
X264_init_static
,
};
};
libavcodec/utils.c
View file @
d97efd7f
...
@@ -107,6 +107,9 @@ void avcodec_register(AVCodec *codec)
...
@@ -107,6 +107,9 @@ void avcodec_register(AVCodec *codec)
while
(
*
p
!=
NULL
)
p
=
&
(
*
p
)
->
next
;
while
(
*
p
!=
NULL
)
p
=
&
(
*
p
)
->
next
;
*
p
=
codec
;
*
p
=
codec
;
codec
->
next
=
NULL
;
codec
->
next
=
NULL
;
if
(
codec
->
init_static_data
)
codec
->
init_static_data
(
codec
);
}
}
unsigned
avcodec_get_edge_width
(
void
)
unsigned
avcodec_get_edge_width
(
void
)
...
...
libavcodec/version.h
View file @
d97efd7f
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 12
#define LIBAVCODEC_VERSION_MINOR 12
#define LIBAVCODEC_VERSION_MICRO
0
#define LIBAVCODEC_VERSION_MICRO
1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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