Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
gst-plugins-bad
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
994
Issues
994
List
Boards
Labels
Service Desk
Milestones
Merge Requests
193
Merge Requests
193
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GStreamer
gst-plugins-bad
Commits
a8151d78
Commit
a8151d78
authored
Jan 14, 2014
by
duhui.lee
Committed by
Sebastian Dröge
Jan 14, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h265parser: Fix segfault when parsing VPS
https://bugzilla.gnome.org/show_bug.cgi?id=722081
parent
e8d569f5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
12 deletions
+13
-12
gst-libs/gst/codecparsers/gsth265parser.c
gst-libs/gst/codecparsers/gsth265parser.c
+6
-6
gst-libs/gst/codecparsers/gsth265parser.h
gst-libs/gst/codecparsers/gsth265parser.h
+7
-6
No files found.
gst-libs/gst/codecparsers/gsth265parser.c
View file @
a8151d78
...
...
@@ -1714,12 +1714,12 @@ gst_h265_parse_vps (GstH265NalUnit * nalu, GstH265VPS * vps)
G_MAXUINT32
-
1
);
}
/* setting default values if vps->sub_layer_ordering_info_present_flag is zero */
if
(
!
vps
->
sub_layer_ordering_info_present_flag
)
{
if
(
!
vps
->
sub_layer_ordering_info_present_flag
&&
vps
->
max_sub_layers_minus1
)
{
for
(
i
=
0
;
i
<=
(
vps
->
max_sub_layers_minus1
-
1
);
i
++
)
{
vps
->
max_dec_pic_buffering_minus1
[
i
]
=
vps
->
max_dec_pic_buffering_minus1
[
vps
->
max_sub_layers_minus1
];
vps
->
max_
dec_pic_buffering_minus1
[
i
]
=
vps
->
max_
dec_pic_buffering_minus1
[
vps
->
max_sub_layers_minus1
];
vps
->
max_
num_reorder_pics
[
i
]
=
vps
->
max_
num_reorder_pics
[
vps
->
max_sub_layers_minus1
];
vps
->
max_latency_increase_plus1
[
i
]
=
vps
->
max_latency_increase_plus1
[
vps
->
max_sub_layers_minus1
];
}
...
...
@@ -1881,12 +1881,12 @@ gst_h265_parse_sps (GstH265Parser * parser, GstH265NalUnit * nalu,
G_MAXUINT32
-
1
);
}
/* setting default values if sps->sub_layer_ordering_info_present_flag is zero */
if
(
!
sps
->
sub_layer_ordering_info_present_flag
)
{
if
(
!
sps
->
sub_layer_ordering_info_present_flag
&&
sps
->
max_sub_layers_minus1
)
{
for
(
i
=
0
;
i
<=
(
sps
->
max_sub_layers_minus1
-
1
);
i
++
)
{
sps
->
max_dec_pic_buffering_minus1
[
i
]
=
sps
->
max_dec_pic_buffering_minus1
[
sps
->
max_sub_layers_minus1
];
sps
->
max_
dec_pic_buffering_minus1
[
i
]
=
sps
->
max_
dec_pic_buffering_minus1
[
sps
->
max_sub_layers_minus1
];
sps
->
max_
num_reorder_pics
[
i
]
=
sps
->
max_
num_reorder_pics
[
sps
->
max_sub_layers_minus1
];
sps
->
max_latency_increase_plus1
[
i
]
=
sps
->
max_latency_increase_plus1
[
sps
->
max_sub_layers_minus1
];
}
...
...
gst-libs/gst/codecparsers/gsth265parser.h
View file @
a8151d78
...
...
@@ -32,6 +32,7 @@
G_BEGIN_DECLS
#define GST_H265_MAX_SUB_LAYERS 8
#define GST_H265_MAX_VPS_COUNT 16
#define GST_H265_MAX_SPS_COUNT 16
#define GST_H265_MAX_PPS_COUNT 64
...
...
@@ -463,9 +464,9 @@ struct _GstH265VPS {
GstH265ProfileTierLevel
profile_tier_level
;
guint8
sub_layer_ordering_info_present_flag
;
guint8
max_dec_pic_buffering_minus1
[
7
];
guint8
max_num_reorder_pics
[
7
];
guint32
max_latency_increase_plus1
[
7
];
guint8
max_dec_pic_buffering_minus1
[
GST_H265_MAX_SUB_LAYERS
];
guint8
max_num_reorder_pics
[
GST_H265_MAX_SUB_LAYERS
];
guint32
max_latency_increase_plus1
[
GST_H265_MAX_SUB_LAYERS
];
guint8
max_layer_id
;
guint16
num_layer_sets_minus1
;
...
...
@@ -703,9 +704,9 @@ struct _GstH265SPS
guint8
log2_max_pic_order_cnt_lsb_minus4
;
guint8
sub_layer_ordering_info_present_flag
;
guint8
max_dec_pic_buffering_minus1
[
7
];
guint8
max_num_reorder_pics
[
7
];
guint8
max_latency_increase_plus1
[
7
];
guint8
max_dec_pic_buffering_minus1
[
GST_H265_MAX_SUB_LAYERS
];
guint8
max_num_reorder_pics
[
GST_H265_MAX_SUB_LAYERS
];
guint8
max_latency_increase_plus1
[
GST_H265_MAX_SUB_LAYERS
];
guint8
log2_min_luma_coding_block_size_minus3
;
guint8
log2_diff_max_min_luma_coding_block_size
;
...
...
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