Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
91beec44
Commit
91beec44
authored
Jul 30, 2015
by
Thomas Guillem
Committed by
Felix Paul Kühne
Jul 31, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
videotoolbox: use nal length size parsed from avcC extradata
Signed-off-by:
Felix Paul Kühne
<
fkuehne@videolan.org
>
parent
3f576688
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
modules/codec/videotoolbox.m
modules/codec/videotoolbox.m
+5
-2
No files found.
modules/codec/videotoolbox.m
View file @
91beec44
...
...
@@ -85,6 +85,7 @@ struct decoder_sys_t
CMVideoCodecType
codec
;
size_t
codec_profile
;
size_t
codec_level
;
uint32_t
i_nal_length_size
;
bool
b_started
;
bool
b_is_avcc
;
...
...
@@ -289,13 +290,14 @@ static int StartVideoToolbox(decoder_t *p_dec, block_t *p_block)
p_buf
,
buf_size
,
&
size
,
&
i_nal
_size
);
&
p_sys
->
i_nal_length
_size
);
p_sys
->
b_is_avcc
=
i_ret
==
VLC_SUCCESS
;
}
else
{
/* we are mid-stream, let's have the h264_get helper see if it
* can find a NAL unit */
size
=
p_block
->
i_buffer
;
p_buf
=
p_block
->
p_buffer
;
p_sys
->
i_nal_length_size
=
4
;
/* default to 4 bytes */
i_ret
=
VLC_SUCCESS
;
}
...
...
@@ -347,7 +349,8 @@ static int StartVideoToolbox(decoder_t *p_dec, block_t *p_block)
p_sys
->
codec_level
=
sps_data
.
i_level
;
/* create avvC atom to forward to the HW decoder */
block_t
*
p_block
=
h264_create_avcdec_config_record
(
4
,
block_t
*
p_block
=
h264_create_avcdec_config_record
(
p_sys
->
i_nal_length_size
,
&
sps_data
,
p_sps_buf
,
i_sps_size
,
p_pps_buf
,
i_pps_size
);
free
(
p_alloc_buf
);
...
...
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