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
16e9cb81
Commit
16e9cb81
authored
Nov 15, 2004
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* asf: first part to support more header extention (seems to be used in MBR).
parent
086deb31
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
0 deletions
+70
-0
modules/access/mms/asf.c
modules/access/mms/asf.c
+56
-0
modules/access/mms/asf.h
modules/access/mms/asf.h
+14
-0
No files found.
modules/access/mms/asf.c
View file @
16e9cb81
...
...
@@ -113,11 +113,64 @@ void E_( asf_HeaderParse )( asf_header_t *hdr,
var_buffer_getmemory
(
&
buffer
,
NULL
,
i_size
-
24
-
16
-
8
-
8
-
8
-
8
-
8
-
8
-
4
-
4
);
}
else
if
(
CmpGuid
(
&
guid
,
&
asf_object_header_extension_guid
)
)
{
/* Enter it */
var_buffer_getmemory
(
&
buffer
,
NULL
,
46
-
24
);
}
else
if
(
CmpGuid
(
&
guid
,
&
asf_object_extended_stream_properties_guid
)
)
{
/* Grrrrrr */
int16_t
i_count1
,
i_count2
;
int
i_subsize
;
int
i
;
//fprintf( stderr, "extended stream properties\n" );
var_buffer_getmemory
(
&
buffer
,
NULL
,
84
-
24
);
i_count1
=
var_buffer_get16
(
&
buffer
);
i_count2
=
var_buffer_get16
(
&
buffer
);
i_subsize
=
88
;
for
(
i
=
0
;
i
<
i_count1
;
i
++
)
{
int
i_len
;
var_buffer_get16
(
&
buffer
);
i_len
=
var_buffer_get16
(
&
buffer
);
var_buffer_getmemory
(
&
buffer
,
NULL
,
i_len
);
i_subsize
=
4
+
i_len
;
}
for
(
i
=
0
;
i
<
i_count2
;
i
++
)
{
int
i_len
;
var_buffer_getmemory
(
&
buffer
,
NULL
,
16
+
2
);
i_len
=
var_buffer_get32
(
&
buffer
);
var_buffer_getmemory
(
&
buffer
,
NULL
,
i_len
);
i_subsize
+=
16
+
6
+
i_len
;
}
//fprintf( stderr, "extended stream properties left=%d\n",
// i_size - i_subsize );
if
(
i_size
-
i_subsize
<=
24
)
{
var_buffer_getmemory
(
&
buffer
,
NULL
,
i_size
-
i_subsize
);
}
/* It's a hack we just skip the first part of the object until
* the embed stream properties if any (ugly, but whose fault ?) */
}
else
if
(
CmpGuid
(
&
guid
,
&
asf_object_stream_properties_guid
)
)
{
int
i_stream_id
;
guid_t
stream_type
;
//fprintf( stderr, "stream properties\n" );
var_buffer_getguid
(
&
buffer
,
&
stream_type
);
var_buffer_getmemory
(
&
buffer
,
NULL
,
32
);
i_stream_id
=
var_buffer_get8
(
&
buffer
)
&
0x7f
;
...
...
@@ -145,6 +198,8 @@ void E_( asf_HeaderParse )( asf_header_t *hdr,
int
i_count
;
uint8_t
i_stream_id
;
//fprintf( stderr, "bitrate properties\n" );
i_count
=
var_buffer_get16
(
&
buffer
);
i_size
-=
2
;
while
(
i_count
>
0
)
...
...
@@ -159,6 +214,7 @@ void E_( asf_HeaderParse )( asf_header_t *hdr,
}
else
{
//fprintf( stderr, "unknown\n" );
//fprintf( stderr, " 3---------------------skip:%lld\n", i_size - 24);
// skip unknown guid
var_buffer_getmemory
(
&
buffer
,
NULL
,
i_size
-
24
);
...
...
modules/access/mms/asf.h
View file @
16e9cb81
...
...
@@ -130,4 +130,18 @@ static const guid_t asf_object_bitrate_mutual_exclusion_guid =
{
0x90
,
0x34
,
0x00
,
0xA0
,
0xC9
,
0x03
,
0x49
,
0xBE
}
};
static
const
guid_t
asf_object_extended_stream_properties_guid
=
{
0x14E6A5CB
,
0xC672
,
0x4332
,
{
0x83
,
0x99
,
0xA9
,
0x69
,
0x52
,
0x06
,
0x5B
,
0x5A
}
};
static
const
guid_t
asf_object_header_extension_guid
=
{
0x5FBF03B5
,
0xA92E
,
0x11CF
,
{
0x8E
,
0xE3
,
0x00
,
0xC0
,
0x0C
,
0x20
,
0x53
,
0x65
}
};
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