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
124fa2e9
Commit
124fa2e9
authored
Jun 30, 2002
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*all : now can find key frame even with broken avi.
parent
fe41bed6
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
160 additions
and
78 deletions
+160
-78
plugins/avi/avi.c
plugins/avi/avi.c
+139
-68
plugins/avi/avi.h
plugins/avi/avi.h
+5
-1
plugins/avi/libioRIFF.c
plugins/avi/libioRIFF.c
+9
-5
plugins/avi/libioRIFF.h
plugins/avi/libioRIFF.h
+7
-4
No files found.
plugins/avi/avi.c
View file @
124fa2e9
This diff is collapsed.
Click to expand it.
plugins/avi/avi.h
View file @
124fa2e9
...
...
@@ -2,7 +2,7 @@
* avi.h : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.h,v 1.
7 2002/06/26 23:11:12
fenrir Exp $
* $Id: avi.h,v 1.
8 2002/06/30 15:07:57
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -36,6 +36,10 @@
#define AVIIF_NOTIME 0x00000100L
/* this frame doesn't take any time */
#define AVIIF_COMPUSE 0x0FFF0000L
/* these bits are for compressor use */
#define AVIIF_FIXKEYFRAME 0x00001000L
/* invented; used to say that
the keyframe flag isn't a true flag
but have to be verified */
/* Sound formats */
#define WAVE_FORMAT_UNKNOWN 0x0000
#define WAVE_FORMAT_PCM 0x0001
...
...
plugins/avi/libioRIFF.c
View file @
124fa2e9
...
...
@@ -2,7 +2,7 @@
* libioRIFF.c : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libioRIFF.c,v 1.1
0 2002/06/30 03:51:29
fenrir Exp $
* $Id: libioRIFF.c,v 1.1
1 2002/06/30 15:07:57
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -119,8 +119,8 @@ riffchunk_t * RIFF_ReadChunk(input_thread_t * p_input)
}
p_riff
->
p_data
=
NULL
;
/* peek to have the begining, 8+
4 where 4 are to get type
*/
if
(
(
count
=
input_Peek
(
p_input
,
&
p_peek
,
1
2
)
)
<
8
)
/* peek to have the begining, 8+
8 get i_8bytes
*/
if
(
(
count
=
input_Peek
(
p_input
,
&
p_peek
,
1
6
)
)
<
8
)
{
msg_Err
(
p_input
,
"cannot peek()"
);
free
(
p_riff
);
...
...
@@ -129,8 +129,12 @@ riffchunk_t * RIFF_ReadChunk(input_thread_t * p_input)
p_riff
->
i_id
=
__GetDWLE
(
p_peek
);
p_riff
->
i_size
=
__GetDWLE
(
p_peek
+
4
);
p_riff
->
i_type
=
(
count
==
12
)
?
__GetDWLE
(
p_peek
+
8
)
:
0
;
p_riff
->
i_type
=
(
count
>=
12
)
?
__GetDWLE
(
p_peek
+
8
)
:
0
;
memset
(
&
p_riff
->
i_8bytes
,
8
,
0
);
if
(
count
>=
12
)
{
memcpy
(
&
p_riff
->
i_8bytes
,
p_peek
+
8
,
count
-
8
);
}
__RIFF_TellPos
(
p_input
,
&
(
p_riff
->
i_pos
)
);
return
(
p_riff
);
...
...
plugins/avi/libioRIFF.h
View file @
124fa2e9
...
...
@@ -2,7 +2,7 @@
* libioRIFF.h : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libioRIFF.h,v 1.
1 2002/06/26 23:11:12
fenrir Exp $
* $Id: libioRIFF.h,v 1.
2 2002/06/30 15:07:57
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -27,6 +27,8 @@ typedef struct riffchunk_s
u32
i_type
;
u32
i_pos
;
data_packet_t
*
p_data
;
u64
i_8bytes
;
/* it's the first 8 bytes after header
used for key frame generation */
}
riffchunk_t
;
int
__RIFF_TellPos
(
input_thread_t
*
p_input
,
u32
*
pos
);
...
...
@@ -41,9 +43,10 @@ int RIFF_FindChunk(input_thread_t * p_input,
int
RIFF_GoToChunkData
(
input_thread_t
*
p_input
);
int
RIFF_LoadChunkData
(
input_thread_t
*
p_input
,
riffchunk_t
*
p_riff
);
int
RIFF_LoadChunkDataInPES
(
input_thread_t
*
p_input
,
pes_packet_t
**
pp_pes
,
int
i_size_index
);
int
RIFF_LoadChunkDataInPES
(
input_thread_t
*
p_input
,
pes_packet_t
**
pp_pes
,
int
i_size_index
);
int
RIFF_GoToChunk
(
input_thread_t
*
p_input
,
riffchunk_t
*
p_riff
);
int
RIFF_TestFileHeader
(
input_thread_t
*
p_input
,
...
...
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