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
e0746a1f
Commit
e0746a1f
authored
Nov 05, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: smooth: add missing language
parent
9031edac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
modules/demux/smooth/playlist/ForgedInitSegment.cpp
modules/demux/smooth/playlist/ForgedInitSegment.cpp
+8
-0
modules/demux/smooth/playlist/ForgedInitSegment.hpp
modules/demux/smooth/playlist/ForgedInitSegment.hpp
+2
-0
modules/demux/smooth/playlist/Parser.cpp
modules/demux/smooth/playlist/Parser.cpp
+5
-0
No files found.
modules/demux/smooth/playlist/ForgedInitSegment.cpp
View file @
e0746a1f
...
...
@@ -199,6 +199,11 @@ void ForgedInitSegment::setFourCC(const std::string &fcc)
}
}
void
ForgedInitSegment
::
setLanguage
(
const
std
::
string
&
lang
)
{
language
=
lang
;
}
block_t
*
ForgedInitSegment
::
buildMoovBox
()
{
mp4mux_trackinfo_t
trackinfo
;
...
...
@@ -264,6 +269,9 @@ block_t * ForgedInitSegment::buildMoovBox()
break
;
}
if
(
!
language
.
empty
())
trackinfo
.
fmt
.
psz_language
=
strdup
(
language
.
c_str
());
mp4mux_trackinfo_t
*
p_tracks
=
&
trackinfo
;
bo_t
*
box
=
GetMoovBox
(
NULL
,
&
p_tracks
,
1
,
true
,
false
,
false
,
false
);
mp4mux_trackinfo_Clear
(
&
trackinfo
);
...
...
modules/demux/smooth/playlist/ForgedInitSegment.hpp
View file @
e0746a1f
...
...
@@ -53,6 +53,7 @@ namespace smooth
void
setFourCC
(
const
std
::
string
&
);
void
setAudioTag
(
uint16_t
);
void
setTrackID
(
unsigned
);
void
setLanguage
(
const
std
::
string
&
);
protected:
virtual
SegmentChunk
*
getChunk
(
const
std
::
string
&
,
HTTPConnectionManager
*
);
/* reimpl */
...
...
@@ -63,6 +64,7 @@ namespace smooth
block_t
*
buildMoovBox
();
std
::
string
data
;
std
::
string
type
;
std
::
string
language
;
uint8_t
*
extradata
;
size_t
i_extradata
;
WAVEFORMATEX
formatex
;
...
...
modules/demux/smooth/playlist/Parser.cpp
View file @
e0746a1f
...
...
@@ -167,6 +167,9 @@ static void ParseQualityLevel(BaseAdaptationSet *adaptSet, Node *qualNode, const
{
initSegment
->
setTrackID
(
trackid
);
if
(
!
adaptSet
->
getLang
().
empty
())
initSegment
->
setLanguage
(
adaptSet
->
getLang
().
front
());
if
(
rep
->
getWidth
()
>
0
&&
rep
->
getHeight
()
>
0
)
initSegment
->
setVideoSize
(
rep
->
getWidth
(),
rep
->
getHeight
());
...
...
@@ -210,6 +213,8 @@ static void ParseStreamIndex(BasePeriod *period, Node *streamIndexNode, unsigned
if
(
adaptSet
)
{
adaptSet
->
setID
(
ID
(
id
));
if
(
streamIndexNode
->
hasAttribute
(
"Language"
))
adaptSet
->
addLang
(
streamIndexNode
->
getAttributeValue
(
"Language"
));
const
std
::
string
url
=
streamIndexNode
->
getAttributeValue
(
"Url"
);
if
(
!
url
.
empty
())
{
...
...
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