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
72da8d9b
Commit
72da8d9b
authored
Mar 29, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264_parser: remove the remaining dependencies on the h264 decoder
parent
98c97994
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
71 additions
and
96 deletions
+71
-96
configure
configure
+1
-1
Makefile
libavcodec/Makefile
+2
-1
h264.c
libavcodec/h264.c
+0
-27
h264.h
libavcodec/h264.h
+0
-5
h264_parse.c
libavcodec/h264_parse.c
+27
-0
h264_parse.h
libavcodec/h264_parse.h
+5
-0
h264_parser.c
libavcodec/h264_parser.c
+36
-62
No files found.
configure
View file @
72da8d9b
...
...
@@ -2192,7 +2192,7 @@ nvenc_h264_encoder_deps="nvenc"
nvenc_hevc_encoder_deps
=
"nvenc"
# parsers
h264_parser_select
=
"
h264_decoder
"
h264_parser_select
=
"
golomb h264dsp
"
hevc_parser_select
=
"golomb"
mpegvideo_parser_select
=
"mpegvideo"
mpeg4video_parser_select
=
"error_resilience h263dsp mpegvideo qpeldsp"
...
...
libavcodec/Makefile
View file @
72da8d9b
...
...
@@ -728,7 +728,8 @@ OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o
OBJS-$(CONFIG_GSM_PARSER)
+=
gsm_parser.o
OBJS-$(CONFIG_H261_PARSER)
+=
h261_parser.o
OBJS-$(CONFIG_H263_PARSER)
+=
h263_parser.o
OBJS-$(CONFIG_H264_PARSER)
+=
h264_parser.o
h264_parse.o
h2645_parse.o
OBJS-$(CONFIG_H264_PARSER)
+=
h264_parser.o
h264_parse.o
h2645_parse.o
\
h264_ps.o
h264_sei.o
h264data.o
OBJS-$(CONFIG_HEVC_PARSER)
+=
hevc_parser.o
h2645_parse.o
hevc_ps.o
hevc_data.o
OBJS-$(CONFIG_MJPEG_PARSER)
+=
mjpeg_parser.o
OBJS-$(CONFIG_MLP_PARSER)
+=
mlp_parser.o
mlp.o
...
...
libavcodec/h264.c
View file @
72da8d9b
...
...
@@ -753,33 +753,6 @@ static void flush_dpb(AVCodecContext *avctx)
h
->
context_initialized
=
0
;
}
/**
* Compute profile from profile_idc and constraint_set?_flags.
*
* @param sps SPS
*
* @return profile as defined by FF_PROFILE_H264_*
*/
int
ff_h264_get_profile
(
const
SPS
*
sps
)
{
int
profile
=
sps
->
profile_idc
;
switch
(
sps
->
profile_idc
)
{
case
FF_PROFILE_H264_BASELINE
:
// constraint_set1_flag set to 1
profile
|=
(
sps
->
constraint_set_flags
&
1
<<
1
)
?
FF_PROFILE_H264_CONSTRAINED
:
0
;
break
;
case
FF_PROFILE_H264_HIGH_10
:
case
FF_PROFILE_H264_HIGH_422
:
case
FF_PROFILE_H264_HIGH_444_PREDICTIVE
:
// constraint_set3_flag set to 1
profile
|=
(
sps
->
constraint_set_flags
&
1
<<
3
)
?
FF_PROFILE_H264_INTRA
:
0
;
break
;
}
return
profile
;
}
static
int
get_last_needed_nal
(
H264Context
*
h
)
{
int
nals_needed
=
0
;
...
...
libavcodec/h264.h
View file @
72da8d9b
...
...
@@ -663,11 +663,6 @@ extern const uint16_t ff_h264_mb_sizes[4];
int
ff_h264_decode_seq_parameter_set
(
GetBitContext
*
gb
,
AVCodecContext
*
avctx
,
H264ParamSets
*
ps
);
/**
* compute profile from sps
*/
int
ff_h264_get_profile
(
const
SPS
*
sps
);
/**
* Decode PPS
*/
...
...
libavcodec/h264_parse.c
View file @
72da8d9b
...
...
@@ -449,3 +449,30 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps,
}
return
0
;
}
/**
* Compute profile from profile_idc and constraint_set?_flags.
*
* @param sps SPS
*
* @return profile as defined by FF_PROFILE_H264_*
*/
int
ff_h264_get_profile
(
const
SPS
*
sps
)
{
int
profile
=
sps
->
profile_idc
;
switch
(
sps
->
profile_idc
)
{
case
FF_PROFILE_H264_BASELINE
:
// constraint_set1_flag set to 1
profile
|=
(
sps
->
constraint_set_flags
&
1
<<
1
)
?
FF_PROFILE_H264_CONSTRAINED
:
0
;
break
;
case
FF_PROFILE_H264_HIGH_10
:
case
FF_PROFILE_H264_HIGH_422
:
case
FF_PROFILE_H264_HIGH_444_PREDICTIVE
:
// constraint_set3_flag set to 1
profile
|=
(
sps
->
constraint_set_flags
&
1
<<
3
)
?
FF_PROFILE_H264_INTRA
:
0
;
break
;
}
return
profile
;
}
libavcodec/h264_parse.h
View file @
72da8d9b
...
...
@@ -87,4 +87,9 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, struct H264ParamSets
int
*
is_avc
,
int
*
nal_length_size
,
int
err_recognition
,
void
*
logctx
);
/**
* compute profile from sps
*/
int
ff_h264_get_profile
(
const
struct
SPS
*
sps
);
#endif
/* AVCODEC_H264_PARSE_H */
libavcodec/h264_parser.c
View file @
72da8d9b
This diff is collapsed.
Click to expand it.
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