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
84bb8327
Commit
84bb8327
authored
Mar 11, 2018
by
Mark Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cbs: Add a table of all supported codec IDs
Use it as the set of codec IDs supported by the trace_headers BSF.
parent
94d42cb4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
9 deletions
+23
-9
configure
configure
+1
-1
cbs.c
libavcodec/cbs.c
+13
-0
cbs.h
libavcodec/cbs.h
+8
-0
trace_headers_bsf.c
libavcodec/trace_headers_bsf.c
+1
-8
No files found.
configure
View file @
84bb8327
...
@@ -2924,7 +2924,7 @@ h264_redundant_pps_bsf_select="cbs_h264"
...
@@ -2924,7 +2924,7 @@ h264_redundant_pps_bsf_select="cbs_h264"
hevc_metadata_bsf_select
=
"cbs_h265"
hevc_metadata_bsf_select
=
"cbs_h265"
mjpeg2jpeg_bsf_select
=
"jpegtables"
mjpeg2jpeg_bsf_select
=
"jpegtables"
mpeg2_metadata_bsf_select
=
"cbs_mpeg2"
mpeg2_metadata_bsf_select
=
"cbs_mpeg2"
trace_headers_bsf_select
=
"cbs
_h264 cbs_h265 cbs_mpeg2
"
trace_headers_bsf_select
=
"cbs"
# external libraries
# external libraries
aac_at_decoder_deps
=
"audiotoolbox"
aac_at_decoder_deps
=
"audiotoolbox"
...
...
libavcodec/cbs.c
View file @
84bb8327
...
@@ -40,6 +40,19 @@ static const CodedBitstreamType *cbs_type_table[] = {
...
@@ -40,6 +40,19 @@ static const CodedBitstreamType *cbs_type_table[] = {
#endif
#endif
};
};
const
enum
AVCodecID
ff_cbs_all_codec_ids
[]
=
{
#if CONFIG_CBS_H264
AV_CODEC_ID_H264
,
#endif
#if CONFIG_CBS_H265
AV_CODEC_ID_H265
,
#endif
#if CONFIG_CBS_MPEG2
AV_CODEC_ID_MPEG2VIDEO
,
#endif
AV_CODEC_ID_NONE
};
int
ff_cbs_init
(
CodedBitstreamContext
**
ctx_ptr
,
int
ff_cbs_init
(
CodedBitstreamContext
**
ctx_ptr
,
enum
AVCodecID
codec_id
,
void
*
log_ctx
)
enum
AVCodecID
codec_id
,
void
*
log_ctx
)
{
{
...
...
libavcodec/cbs.h
View file @
84bb8327
...
@@ -201,6 +201,14 @@ typedef struct CodedBitstreamContext {
...
@@ -201,6 +201,14 @@ typedef struct CodedBitstreamContext {
}
CodedBitstreamContext
;
}
CodedBitstreamContext
;
/**
* Table of all supported codec IDs.
*
* Terminated by AV_CODEC_ID_NONE.
*/
extern
const
enum
AVCodecID
ff_cbs_all_codec_ids
[];
/**
/**
* Create and initialise a new context for the given codec.
* Create and initialise a new context for the given codec.
*/
*/
...
...
libavcodec/trace_headers_bsf.c
View file @
84bb8327
...
@@ -107,18 +107,11 @@ static int trace_headers(AVBSFContext *bsf, AVPacket *pkt)
...
@@ -107,18 +107,11 @@ static int trace_headers(AVBSFContext *bsf, AVPacket *pkt)
return
0
;
return
0
;
}
}
static
const
enum
AVCodecID
trace_headers_codec_ids
[]
=
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_HEVC
,
AV_CODEC_ID_MPEG2VIDEO
,
AV_CODEC_ID_NONE
,
};
const
AVBitStreamFilter
ff_trace_headers_bsf
=
{
const
AVBitStreamFilter
ff_trace_headers_bsf
=
{
.
name
=
"trace_headers"
,
.
name
=
"trace_headers"
,
.
priv_data_size
=
sizeof
(
TraceHeadersContext
),
.
priv_data_size
=
sizeof
(
TraceHeadersContext
),
.
init
=
&
trace_headers_init
,
.
init
=
&
trace_headers_init
,
.
close
=
&
trace_headers_close
,
.
close
=
&
trace_headers_close
,
.
filter
=
&
trace_headers
,
.
filter
=
&
trace_headers
,
.
codec_ids
=
trace_headers
_codec_ids
,
.
codec_ids
=
ff_cbs_all
_codec_ids
,
};
};
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