Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
bc77d458
Commit
bc77d458
authored
Jan 03, 2012
by
Hugo Beauzée-Luyssen
Committed by
Jean-Baptiste Kempf
Jan 06, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dash: Store the parent Group in every representations.
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
f4816ca7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
7 deletions
+24
-7
modules/stream_filter/dash/mpd/BasicCMParser.cpp
modules/stream_filter/dash/mpd/BasicCMParser.cpp
+2
-1
modules/stream_filter/dash/mpd/Representation.cpp
modules/stream_filter/dash/mpd/Representation.cpp
+14
-3
modules/stream_filter/dash/mpd/Representation.h
modules/stream_filter/dash/mpd/Representation.h
+8
-3
No files found.
modules/stream_filter/dash/mpd/BasicCMParser.cpp
View file @
bc77d458
...
@@ -287,7 +287,8 @@ void BasicCMParser::setRepresentations (Node *root, Group *group)
...
@@ -287,7 +287,8 @@ void BasicCMParser::setRepresentations (Node *root, Group *group)
{
{
const
std
::
map
<
std
::
string
,
std
::
string
>
attributes
=
representations
.
at
(
i
)
->
getAttributes
();
const
std
::
map
<
std
::
string
,
std
::
string
>
attributes
=
representations
.
at
(
i
)
->
getAttributes
();
Representation
*
rep
=
new
Representation
(
attributes
);
Representation
*
rep
=
new
Representation
;
rep
->
setParentGroup
(
group
);
if
(
this
->
parseCommonAttributesElements
(
representations
.
at
(
i
),
rep
,
group
)
==
false
)
if
(
this
->
parseCommonAttributesElements
(
representations
.
at
(
i
),
rep
,
group
)
==
false
)
{
{
delete
rep
;
delete
rep
;
...
...
modules/stream_filter/dash/mpd/Representation.cpp
View file @
bc77d458
...
@@ -31,11 +31,11 @@
...
@@ -31,11 +31,11 @@
using
namespace
dash
::
mpd
;
using
namespace
dash
::
mpd
;
Representation
::
Representation
(
const
std
::
map
<
std
::
string
,
std
::
string
>&
attributes
)
:
Representation
::
Representation
(
)
:
qualityRanking
(
-
1
),
qualityRanking
(
-
1
),
attributes
(
attributes
),
segmentInfo
(
NULL
),
segmentInfo
(
NULL
),
trickModeType
(
NULL
)
trickModeType
(
NULL
),
parentGroup
(
NULL
)
{
{
}
}
...
@@ -82,6 +82,17 @@ void Representation::setTrickMode (TrickModeType *trickMod
...
@@ -82,6 +82,17 @@ void Representation::setTrickMode (TrickModeType *trickMod
this
->
trickModeType
=
trickModeType
;
this
->
trickModeType
=
trickModeType
;
}
}
const
Group
*
Representation
::
getParentGroup
()
const
{
return
this
->
parentGroup
;
}
void
Representation
::
setParentGroup
(
const
Group
*
group
)
{
if
(
group
!=
NULL
)
this
->
parentGroup
=
group
;
}
void
Representation
::
setSegmentInfo
(
SegmentInfo
*
info
)
void
Representation
::
setSegmentInfo
(
SegmentInfo
*
info
)
{
{
this
->
segmentInfo
=
info
;
this
->
segmentInfo
=
info
;
...
...
modules/stream_filter/dash/mpd/Representation.h
View file @
bc77d458
...
@@ -35,10 +35,12 @@ namespace dash
...
@@ -35,10 +35,12 @@ namespace dash
{
{
namespace
mpd
namespace
mpd
{
{
class
Group
;
class
Representation
:
public
CommonAttributesElements
class
Representation
:
public
CommonAttributesElements
{
{
public:
public:
Representation
(
const
std
::
map
<
std
::
string
,
std
::
string
>&
attributes
);
Representation
(
);
virtual
~
Representation
();
virtual
~
Representation
();
const
std
::
string
&
getId
()
const
;
const
std
::
string
&
getId
()
const
;
...
@@ -65,14 +67,17 @@ namespace dash
...
@@ -65,14 +67,17 @@ namespace dash
void
setSegmentInfo
(
SegmentInfo
*
info
);
void
setSegmentInfo
(
SegmentInfo
*
info
);
void
setTrickMode
(
TrickModeType
*
trickModeType
);
void
setTrickMode
(
TrickModeType
*
trickModeType
);
const
Group
*
getParentGroup
()
const
;
void
setParentGroup
(
const
Group
*
group
);
private:
private:
int
bandwidth
;
int
bandwidth
;
std
::
string
id
;
int
qualityRanking
;
std
::
string
id
;
int
qualityRanking
;
std
::
list
<
const
Representation
*>
dependencies
;
std
::
list
<
const
Representation
*>
dependencies
;
std
::
map
<
std
::
string
,
std
::
string
>
attributes
;
SegmentInfo
*
segmentInfo
;
SegmentInfo
*
segmentInfo
;
TrickModeType
*
trickModeType
;
TrickModeType
*
trickModeType
;
const
Group
*
parentGroup
;
};
};
}
}
}
}
...
...
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