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
5d21ca45
Commit
5d21ca45
authored
Jun 11, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264_mp4toannexb_bsf: K&R formatting cosmetics
parent
59d7bb99
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
32 deletions
+41
-32
h264_mp4toannexb_bsf.c
libavcodec/h264_mp4toannexb_bsf.c
+41
-32
No files found.
libavcodec/h264_mp4toannexb_bsf.c
View file @
5d21ca45
...
@@ -33,24 +33,26 @@ typedef struct H264BSFContext {
...
@@ -33,24 +33,26 @@ typedef struct H264BSFContext {
static
int
alloc_and_copy
(
uint8_t
**
poutbuf
,
int
*
poutbuf_size
,
static
int
alloc_and_copy
(
uint8_t
**
poutbuf
,
int
*
poutbuf_size
,
const
uint8_t
*
sps_pps
,
uint32_t
sps_pps_size
,
const
uint8_t
*
sps_pps
,
uint32_t
sps_pps_size
,
const
uint8_t
*
in
,
uint32_t
in_size
)
{
const
uint8_t
*
in
,
uint32_t
in_size
)
{
uint32_t
offset
=
*
poutbuf_size
;
uint32_t
offset
=
*
poutbuf_size
;
uint8_t
nal_header_size
=
offset
?
3
:
4
;
uint8_t
nal_header_size
=
offset
?
3
:
4
;
void
*
tmp
;
void
*
tmp
;
*
poutbuf_size
+=
sps_pps_size
+
in_size
+
nal_header_size
;
*
poutbuf_size
+=
sps_pps_size
+
in_size
+
nal_header_size
;
tmp
=
av_realloc
(
*
poutbuf
,
*
poutbuf_size
);
tmp
=
av_realloc
(
*
poutbuf
,
*
poutbuf_size
);
if
(
!
tmp
)
if
(
!
tmp
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
*
poutbuf
=
tmp
;
*
poutbuf
=
tmp
;
if
(
sps_pps
)
if
(
sps_pps
)
memcpy
(
*
poutbuf
+
offset
,
sps_pps
,
sps_pps_size
);
memcpy
(
*
poutbuf
+
offset
,
sps_pps
,
sps_pps_size
);
memcpy
(
*
poutbuf
+
sps_pps_size
+
nal_header_size
+
offset
,
in
,
in_size
);
memcpy
(
*
poutbuf
+
sps_pps_size
+
nal_header_size
+
offset
,
in
,
in_size
);
if
(
!
offset
)
{
if
(
!
offset
)
{
AV_WB32
(
*
poutbuf
+
sps_pps_size
,
1
);
AV_WB32
(
*
poutbuf
+
sps_pps_size
,
1
);
}
else
{
}
else
{
(
*
poutbuf
+
offset
+
sps_pps_size
)[
0
]
=
(
*
poutbuf
+
offset
+
sps_pps_size
)[
1
]
=
0
;
(
*
poutbuf
+
offset
+
sps_pps_size
)[
0
]
=
(
*
poutbuf
+
offset
+
sps_pps_size
)[
2
]
=
1
;
(
*
poutbuf
+
offset
+
sps_pps_size
)[
1
]
=
0
;
(
*
poutbuf
+
offset
+
sps_pps_size
)[
2
]
=
1
;
}
}
return
0
;
return
0
;
...
@@ -60,7 +62,8 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
...
@@ -60,7 +62,8 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
AVCodecContext
*
avctx
,
const
char
*
args
,
AVCodecContext
*
avctx
,
const
char
*
args
,
uint8_t
**
poutbuf
,
int
*
poutbuf_size
,
uint8_t
**
poutbuf
,
int
*
poutbuf_size
,
const
uint8_t
*
buf
,
int
buf_size
,
const
uint8_t
*
buf
,
int
buf_size
,
int
keyframe
)
{
int
keyframe
)
{
H264BSFContext
*
ctx
=
bsfc
->
priv_data
;
H264BSFContext
*
ctx
=
bsfc
->
priv_data
;
uint8_t
unit_type
;
uint8_t
unit_type
;
int32_t
nal_size
;
int32_t
nal_size
;
...
@@ -69,7 +72,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
...
@@ -69,7 +72,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
/* nothing to filter */
/* nothing to filter */
if
(
!
avctx
->
extradata
||
avctx
->
extradata_size
<
6
)
{
if
(
!
avctx
->
extradata
||
avctx
->
extradata_size
<
6
)
{
*
poutbuf
=
(
uint8_t
*
)
buf
;
*
poutbuf
=
(
uint8_t
*
)
buf
;
*
poutbuf_size
=
buf_size
;
*
poutbuf_size
=
buf_size
;
return
0
;
return
0
;
}
}
...
@@ -78,9 +81,10 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
...
@@ -78,9 +81,10 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
if
(
!
ctx
->
extradata_parsed
)
{
if
(
!
ctx
->
extradata_parsed
)
{
uint16_t
unit_size
;
uint16_t
unit_size
;
uint64_t
total_size
=
0
;
uint64_t
total_size
=
0
;
uint8_t
*
out
=
NULL
,
unit_nb
,
sps_done
=
0
,
sps_seen
=
0
,
pps_seen
=
0
;
uint8_t
*
out
=
NULL
,
unit_nb
,
sps_done
=
0
,
const
uint8_t
*
extradata
=
avctx
->
extradata
+
4
;
sps_seen
=
0
,
pps_seen
=
0
;
static
const
uint8_t
nalu_header
[
4
]
=
{
0
,
0
,
0
,
1
};
const
uint8_t
*
extradata
=
avctx
->
extradata
+
4
;
static
const
uint8_t
nalu_header
[
4
]
=
{
0
,
0
,
0
,
1
};
/* retrieve length coded size */
/* retrieve length coded size */
ctx
->
length_size
=
(
*
extradata
++
&
0x3
)
+
1
;
ctx
->
length_size
=
(
*
extradata
++
&
0x3
)
+
1
;
...
@@ -103,9 +107,10 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
...
@@ -103,9 +107,10 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
void
*
tmp
;
void
*
tmp
;
unit_size
=
AV_RB16
(
extradata
);
unit_size
=
AV_RB16
(
extradata
);
total_size
+=
unit_size
+
4
;
total_size
+=
unit_size
+
4
;
if
(
total_size
>
INT_MAX
-
FF_INPUT_BUFFER_PADDING_SIZE
||
if
(
total_size
>
INT_MAX
-
FF_INPUT_BUFFER_PADDING_SIZE
||
extradata
+
2
+
unit_size
>
avctx
->
extradata
+
avctx
->
extradata_size
)
{
extradata
+
2
+
unit_size
>
avctx
->
extradata
+
avctx
->
extradata_size
)
{
av_free
(
out
);
av_free
(
out
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
...
@@ -115,9 +120,9 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
...
@@ -115,9 +120,9 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
}
}
out
=
tmp
;
out
=
tmp
;
memcpy
(
out
+
total_size
-
unit_size
-
4
,
nalu_header
,
4
);
memcpy
(
out
+
total_size
-
unit_size
-
4
,
nalu_header
,
4
);
memcpy
(
out
+
total_size
-
unit_size
,
extradata
+
2
,
unit_size
);
memcpy
(
out
+
total_size
-
unit_size
,
extradata
+
2
,
unit_size
);
extradata
+=
2
+
unit_size
;
extradata
+=
2
+
unit_size
;
if
(
!
unit_nb
&&
!
sps_done
++
)
{
if
(
!
unit_nb
&&
!
sps_done
++
)
{
unit_nb
=
*
extradata
++
;
/* number of pps unit(s) */
unit_nb
=
*
extradata
++
;
/* number of pps unit(s) */
...
@@ -126,13 +131,18 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
...
@@ -126,13 +131,18 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
}
}
}
}
if
(
out
)
if
(
out
)
memset
(
out
+
total_size
,
0
,
FF_INPUT_BUFFER_PADDING_SIZE
);
memset
(
out
+
total_size
,
0
,
FF_INPUT_BUFFER_PADDING_SIZE
);
if
(
!
sps_seen
)
if
(
!
sps_seen
)
av_log
(
avctx
,
AV_LOG_WARNING
,
"Warning: SPS NALU missing or invalid. The resulting stream may not play.
\n
"
);
av_log
(
avctx
,
AV_LOG_WARNING
,
"Warning: SPS NALU missing or invalid. "
"The resulting stream may not play.
\n
"
);
if
(
!
pps_seen
)
if
(
!
pps_seen
)
av_log
(
avctx
,
AV_LOG_WARNING
,
"Warning: PPS NALU missing or invalid. The resulting stream may not play.
\n
"
);
av_log
(
avctx
,
AV_LOG_WARNING
,
"Warning: PPS NALU missing or invalid. "
"The resulting stream may not play.
\n
"
);
av_free
(
avctx
->
extradata
);
av_free
(
avctx
->
extradata
);
avctx
->
extradata
=
out
;
avctx
->
extradata
=
out
;
...
@@ -169,8 +179,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
...
@@ -169,8 +179,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
ctx
->
first_idr
=
0
;
ctx
->
first_idr
=
0
;
}
else
{
}
else
{
if
(
alloc_and_copy
(
poutbuf
,
poutbuf_size
,
if
(
alloc_and_copy
(
poutbuf
,
poutbuf_size
,
NULL
,
0
,
NULL
,
0
,
buf
,
nal_size
)
<
0
)
buf
,
nal_size
)
<
0
)
goto
fail
;
goto
fail
;
if
(
!
ctx
->
first_idr
&&
unit_type
==
1
)
if
(
!
ctx
->
first_idr
&&
unit_type
==
1
)
ctx
->
first_idr
=
1
;
ctx
->
first_idr
=
1
;
...
...
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