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
dbc3f265
Commit
dbc3f265
authored
May 04, 2002
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*** empty log message ***
parent
0a65df88
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
50 deletions
+39
-50
plugins/avi/avi.c
plugins/avi/avi.c
+34
-45
plugins/avi/libioRIFF.c
plugins/avi/libioRIFF.c
+5
-5
No files found.
plugins/avi/avi.c
View file @
dbc3f265
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* avi.c : AVI file Stream input module for vlc
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.1
0 2002/05/02 10:54:34
fenrir Exp $
* $Id: avi.c,v 1.1
1 2002/05/04 16:51:05
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
...
@@ -112,14 +112,11 @@ static void __AVIFreeDemuxData( input_thread_t *p_input )
...
@@ -112,14 +112,11 @@ static void __AVIFreeDemuxData( input_thread_t *p_input )
{
{
if
(
p_avi_demux
->
pp_info
[
i
]
!=
NULL
)
if
(
p_avi_demux
->
pp_info
[
i
]
!=
NULL
)
{
{
#define p_info p_avi_demux->pp_info[i]
if
(
p_avi_demux
->
pp_info
[
i
]
->
p_index
!=
NULL
)
if
(
p_info
->
p_index
!=
NULL
)
{
{
free
(
p_
info
->
p_index
);
free
(
p_
avi_demux
->
pp_info
[
i
]
->
p_index
);
}
}
free
(
p_info
);
free
(
p_avi_demux
->
pp_info
[
i
]
);
#undef p_info
}
}
}
}
free
(
p_avi_demux
->
pp_info
);
free
(
p_avi_demux
->
pp_info
);
...
@@ -306,13 +303,14 @@ static void __AVI_GetIndex( input_thread_t *p_input )
...
@@ -306,13 +303,14 @@ static void __AVI_GetIndex( input_thread_t *p_input )
index
.
i_offset
=
__GetDoubleWordLittleEndianFromBuff
(
p_peek
+
8
);
index
.
i_offset
=
__GetDoubleWordLittleEndianFromBuff
(
p_peek
+
8
);
index
.
i_length
=
__GetDoubleWordLittleEndianFromBuff
(
p_peek
+
12
);
index
.
i_length
=
__GetDoubleWordLittleEndianFromBuff
(
p_peek
+
12
);
if
(
(
__AVI_ParseStreamHeader
(
index
.
i_id
,
&
i_number
,
&
i_type
)
!=
0
)
if
(
(
__AVI_ParseStreamHeader
(
index
.
i_id
,
&
i_number
,
&
i_type
)
==
0
)
||
(
i_number
>
p_avi_demux
->
i_streams
))
&&
(
i_number
<
p_avi_demux
->
i_streams
)
&&
(
p_avi_demux
->
pp_info
[
i_number
]
->
i_cat
==
__AVIGetESTypeFromTwoCC
(
i_type
)))
{
{
continue
;
__AVI_AddEntryIndex
(
p_avi_demux
->
pp_info
[
i_number
],
&
index
);
}
}
__AVI_AddEntryIndex
(
p_avi_demux
->
pp_info
[
i_number
],
&
index
);
}
}
__RIFF_SkipBytes
(
p_input
,
16
*
i_read
);
__RIFF_SkipBytes
(
p_input
,
16
*
i_read
);
}
}
...
@@ -563,7 +561,7 @@ static int AVIInit( input_thread_t *p_input )
...
@@ -563,7 +561,7 @@ static int AVIInit( input_thread_t *p_input )
return
(
-
1
);
return
(
-
1
);
}
}
__AVI_Parse_Header
(
&
p_info
->
header
,
__AVI_Parse_Header
(
&
p_info
->
header
,
p_strh
->
p_data
->
p_payload_start
);
p_strh
->
p_data
->
p_payload_start
);
RIFF_DeleteChunk
(
p_input
,
p_strh
);
RIFF_DeleteChunk
(
p_input
,
p_strh
);
/* in LIST-strl search strf */
/* in LIST-strl search strf */
...
@@ -684,14 +682,13 @@ static int AVIInit( input_thread_t *p_input )
...
@@ -684,14 +682,13 @@ static int AVIInit( input_thread_t *p_input )
#define p_info p_avi_demux->pp_info[i]
#define p_info p_avi_demux->pp_info[i]
if
(
p_info
->
p_index
==
NULL
)
if
(
p_info
->
p_index
==
NULL
)
{
{
intf_WarnMsg
(
3
,
"input init: add index entry for stream %d"
,
i
);
RIFF_GoToChunk
(
p_input
,
p_avi_demux
->
p_movi
);
RIFF_GoToChunk
(
p_input
,
p_avi_demux
->
p_movi
);
if
(
RIFF_DescendChunk
(
p_input
)
!=
0
)
{
continue
;
}
if
(
RIFF_DescendChunk
(
p_input
)
!=
0
)
{
continue
;
}
p_chunk
=
NULL
;
p_chunk
=
NULL
;
p_info
->
i_idxoffset
=
0
;
/* ref: begining of file */
switch
(
p_info
->
i_cat
)
switch
(
p_info
->
i_cat
)
{
{
case
(
AUDIO_ES
):
case
(
AUDIO_ES
):
p_info
->
i_idxoffset
=
0
;
/* ref: begining of file */
if
(
RIFF_FindChunk
(
p_input
,
if
(
RIFF_FindChunk
(
p_input
,
MAKEFOURCC
(
'0'
+
i
/
10
,
'0'
+
i
%
10
,
'w'
,
'b'
),
MAKEFOURCC
(
'0'
+
i
/
10
,
'0'
+
i
%
10
,
'w'
,
'b'
),
p_movi
)
==
0
)
p_movi
)
==
0
)
...
@@ -701,7 +698,6 @@ static int AVIInit( input_thread_t *p_input )
...
@@ -701,7 +698,6 @@ static int AVIInit( input_thread_t *p_input )
break
;
break
;
case
(
VIDEO_ES
):
case
(
VIDEO_ES
):
p_info
->
i_idxoffset
=
0
;
if
(
(
RIFF_FindChunk
(
p_input
,
if
(
(
RIFF_FindChunk
(
p_input
,
MAKEFOURCC
(
'0'
+
i
/
10
,
'0'
+
i
%
10
,
'd'
,
'c'
),
MAKEFOURCC
(
'0'
+
i
/
10
,
'0'
+
i
%
10
,
'd'
,
'c'
),
p_movi
)
==
0
)
)
p_movi
)
==
0
)
)
...
@@ -728,6 +724,10 @@ static int AVIInit( input_thread_t *p_input )
...
@@ -728,6 +724,10 @@ static int AVIInit( input_thread_t *p_input )
index
.
i_offset
=
p_chunk
->
i_pos
;
index
.
i_offset
=
p_chunk
->
i_pos
;
index
.
i_length
=
p_chunk
->
i_size
;
index
.
i_length
=
p_chunk
->
i_size
;
__AVI_AddEntryIndex
(
p_info
,
&
index
);
__AVI_AddEntryIndex
(
p_info
,
&
index
);
intf_WarnMsg
(
3
,
"input init: add index entry (%4.4s) (%d)"
,
(
char
*
)
&
p_chunk
->
i_id
,
i
);
}
}
}
}
#undef p_info
#undef p_info
...
@@ -844,7 +844,7 @@ static mtime_t __AVI_GetPTS( AVIStreamInfo_t *p_info )
...
@@ -844,7 +844,7 @@ static mtime_t __AVI_GetPTS( AVIStreamInfo_t *p_info )
{
{
i_pts
=
(
mtime_t
)(
(
double
)
1000000
.
0
*
i_pts
=
(
mtime_t
)(
(
double
)
1000000
.
0
*
((
double
)
p_info
->
p_index
[
p_info
->
i_idxposc
].
i_lengthtotal
+
((
double
)
p_info
->
p_index
[
p_info
->
i_idxposc
].
i_lengthtotal
+
(
double
)
p_info
->
i_idxposb
)
*
(
double
)
p_info
->
i_idxposb
)
*
(
double
)
p_info
->
header
.
i_scale
/
(
double
)
p_info
->
header
.
i_scale
/
(
double
)
p_info
->
header
.
i_rate
/
(
double
)
p_info
->
header
.
i_rate
/
(
double
)
p_info
->
header
.
i_samplesize
);
(
double
)
p_info
->
header
.
i_samplesize
);
...
@@ -917,14 +917,7 @@ static int __AVI_NextIndexEntry( input_thread_t *p_input,
...
@@ -917,14 +917,7 @@ static int __AVI_NextIndexEntry( input_thread_t *p_input,
u16
i_type
;
u16
i_type
;
if
(
(
p_chunk
=
RIFF_ReadChunk
(
p_input
))
==
NULL
)
if
(
(
p_chunk
=
RIFF_ReadChunk
(
p_input
))
==
NULL
)
{
{
if
(
b_inc
)
return
(
b_inc
==
1
?
0
:
-
1
);
{
return
(
0
);
}
else
{
return
(
-
1
);
}
}
}
index
.
i_id
=
p_chunk
->
i_id
;
index
.
i_id
=
p_chunk
->
i_id
;
...
@@ -950,14 +943,7 @@ static int __AVI_NextIndexEntry( input_thread_t *p_input,
...
@@ -950,14 +943,7 @@ static int __AVI_NextIndexEntry( input_thread_t *p_input,
#undef p_info_i
#undef p_info_i
if
(
RIFF_NextChunk
(
p_input
,
p_avi_demux
->
p_movi
)
!=
0
)
if
(
RIFF_NextChunk
(
p_input
,
p_avi_demux
->
p_movi
)
!=
0
)
{
{
if
(
b_inc
)
return
(
b_inc
==
1
?
0
:
-
1
);
{
return
(
0
);
}
else
{
return
(
-
1
);
}
}
}
}
}
return
(
0
);
return
(
0
);
...
@@ -1267,7 +1253,7 @@ static int __AVI_ReAlign( input_thread_t *p_input )
...
@@ -1267,7 +1253,7 @@ static int __AVI_ReAlign( input_thread_t *p_input )
}
}
while
(
i_pos
>=
p_info
->
p_index
[
p_info
->
i_idxposc
].
i_offset
+
while
(
i_pos
>=
p_info
->
p_index
[
p_info
->
i_idxposc
].
i_offset
+
p_info
->
p_index
[
p_info
->
i_idxposc
].
i_length
)
p_info
->
p_index
[
p_info
->
i_idxposc
].
i_length
+
8
)
{
{
/* search after i_idxposc */
/* search after i_idxposc */
if
(
__AVI_NextIndexEntry
(
p_input
,
p_info
)
!=
0
)
if
(
__AVI_NextIndexEntry
(
p_input
,
p_info
)
!=
0
)
...
@@ -1297,9 +1283,9 @@ static int __AVI_ReAlign( input_thread_t *p_input )
...
@@ -1297,9 +1283,9 @@ static int __AVI_ReAlign( input_thread_t *p_input )
p_info
->
i_idxposc
--
;
p_info
->
i_idxposc
--
;
}
}
}
}
__AVI_GoToStreamChunk
(
p_input
,
p_info
,
p_info
->
i_idxposc
);
}
}
__AVI_GoToStreamChunk
(
p_input
,
p_info
,
p_info
->
i_idxposc
);
return
(
0
);
return
(
0
);
}
}
...
@@ -1372,10 +1358,10 @@ static pes_packet_t *__AVI_GetFrameInPES( input_thread_t *p_input,
...
@@ -1372,10 +1358,10 @@ static pes_packet_t *__AVI_GetFrameInPES( input_thread_t *p_input,
{
{
return
(
NULL
)
;
return
(
NULL
)
;
}
}
/* if i_pts is too small use
10
0 ms */
/* if i_pts is too small use
5
0 ms */
if
(
i_dpts
<=
10
0000
)
if
(
i_dpts
<=
5
0000
)
{
{
i_dpts
=
100000
;
/* 10
0 ms by default */
i_dpts
=
50000
;
/* 5
0 ms by default */
}
}
if
(
!
p_info
->
header
.
i_samplesize
)
if
(
!
p_info
->
header
.
i_samplesize
)
...
@@ -1506,6 +1492,7 @@ static int AVIDemux( input_thread_t *p_input )
...
@@ -1506,6 +1492,7 @@ static int AVIDemux( input_thread_t *p_input )
}
}
}
}
}
}
/* for now, we need at least one video stream */
/* for now, we need at least one video stream */
if
(
!
p_avi_demux
->
p_info_video
)
if
(
!
p_avi_demux
->
p_info_video
)
{
{
...
@@ -1524,7 +1511,8 @@ static int AVIDemux( input_thread_t *p_input )
...
@@ -1524,7 +1511,8 @@ static int AVIDemux( input_thread_t *p_input )
if
(
p_input
->
stream
.
p_selected_program
->
i_synchro_state
==
SYNCHRO_REINIT
)
if
(
p_input
->
stream
.
p_selected_program
->
i_synchro_state
==
SYNCHRO_REINIT
)
{
{
msleep
(
200000
);
/* 200ms delay to have empty audio and video buffer*/
/* wait until buffer is empty */
msleep
(
2
*
DEFAULT_PTS_DELAY
);
/*realign audio and video stream to the good pts*/
/*realign audio and video stream to the good pts*/
if
(
__AVI_ReAlign
(
p_input
)
!=
0
)
if
(
__AVI_ReAlign
(
p_input
)
!=
0
)
{
{
...
@@ -1535,11 +1523,10 @@ static int AVIDemux( input_thread_t *p_input )
...
@@ -1535,11 +1523,10 @@ static int AVIDemux( input_thread_t *p_input )
p_avi_demux
->
i_rate
=
DEFAULT_RATE
;
p_avi_demux
->
i_rate
=
DEFAULT_RATE
;
}
}
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
if
(
p_input
->
stream
.
control
.
i_rate
!=
p_avi_demux
->
i_rate
)
if
(
p_input
->
stream
.
control
.
i_rate
!=
p_avi_demux
->
i_rate
)
{
{
msleep
(
2
00000
);
msleep
(
2
*
DEFAULT_PTS_DELAY
);
p_avi_demux
->
i_rate
=
p_input
->
stream
.
control
.
i_rate
;
p_avi_demux
->
i_rate
=
p_input
->
stream
.
control
.
i_rate
;
p_avi_demux
->
i_date
=
mdate
()
+
DEFAULT_PTS_DELAY
p_avi_demux
->
i_date
=
mdate
()
+
DEFAULT_PTS_DELAY
-
__AVI_GetPTS
(
p_avi_demux
->
p_info_video
)
*
-
__AVI_GetPTS
(
p_avi_demux
->
p_info_video
)
*
...
@@ -1558,7 +1545,7 @@ static int AVIDemux( input_thread_t *p_input )
...
@@ -1558,7 +1545,7 @@ static int AVIDemux( input_thread_t *p_input )
p_avi_demux
->
p_info_audio
=
NULL
;
p_avi_demux
->
p_info_audio
=
NULL
;
}
}
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
/* take care of newly selected audio ES */
/* take care of newly selected audio ES */
if
(
(
p_avi_demux
->
p_info_audio
!=
NULL
)
if
(
(
p_avi_demux
->
p_info_audio
!=
NULL
)
&&
(
p_avi_demux
->
p_info_audio
->
b_selected
))
&&
(
p_avi_demux
->
p_info_audio
->
b_selected
))
...
@@ -1567,10 +1554,11 @@ static int AVIDemux( input_thread_t *p_input )
...
@@ -1567,10 +1554,11 @@ static int AVIDemux( input_thread_t *p_input )
__AVI_SynchroReInit
(
p_input
);
/* resynchro, and make pts audio
__AVI_SynchroReInit
(
p_input
);
/* resynchro, and make pts audio
and video egual */
and video egual */
}
}
/* get audio and video frame */
/* get audio and video frame */
if
(
p_avi_demux
->
p_info_video
!=
NULL
)
if
(
p_avi_demux
->
p_info_video
!=
NULL
)
{
{
p_pes_video
=
__AVI_GetFrameInPES
(
p_input
,
p_pes_video
=
__AVI_GetFrameInPES
(
p_input
,
p_avi_demux
->
p_info_video
,
p_avi_demux
->
p_info_video
,
100000
);
/* 100 ms */
100000
);
/* 100 ms */
if
(
p_avi_demux
->
p_info_audio
!=
NULL
)
if
(
p_avi_demux
->
p_info_audio
!=
NULL
)
...
@@ -1592,12 +1580,13 @@ static int AVIDemux( input_thread_t *p_input )
...
@@ -1592,12 +1580,13 @@ static int AVIDemux( input_thread_t *p_input )
p_avi_demux
->
p_info_audio
,
p_avi_demux
->
p_info_audio
,
100000
);
/* 100 ms */
100000
);
/* 100 ms */
}
}
/* send them to decoder */
/* send them to decoder */
__AVI_DecodePES
(
p_avi_demux
->
p_info_audio
,
p_pes_audio
,
__AVI_DecodePES
(
p_avi_demux
->
p_info_audio
,
p_pes_audio
,
p_avi_demux
->
i_date
,
p_avi_demux
->
i_rate
);
p_avi_demux
->
i_date
,
p_avi_demux
->
i_rate
);
__AVI_DecodePES
(
p_avi_demux
->
p_info_video
,
p_pes_video
,
__AVI_DecodePES
(
p_avi_demux
->
p_info_video
,
p_pes_video
,
p_avi_demux
->
i_date
,
p_avi_demux
->
i_rate
);
p_avi_demux
->
i_date
,
p_avi_demux
->
i_rate
);
if
(
!
p_pes_video
)
/* no more video */
if
(
!
p_pes_video
)
/* no more video */
{
/* currently i need a video stream */
{
/* currently i need a video stream */
return
(
0
);
return
(
0
);
...
...
plugins/avi/libioRIFF.c
View file @
dbc3f265
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* libioRIFF.c : AVI file Stream input module for vlc
* libioRIFF.c : AVI file Stream input module for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: libioRIFF.c,v 1.
3 2002/05/02 10:54:34
fenrir Exp $
* $Id: libioRIFF.c,v 1.
4 2002/05/04 16:51:05
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
...
@@ -25,13 +25,12 @@ typedef struct riffchunk_s
...
@@ -25,13 +25,12 @@ typedef struct riffchunk_s
u32
i_id
;
u32
i_id
;
u32
i_size
;
u32
i_size
;
u32
i_type
;
u32
i_type
;
u32
i_pos
;
/* peut etre a changer */
u32
i_pos
;
data_packet_t
*
p_data
;
/* pas forcement utilise */
data_packet_t
*
p_data
;
struct
riffchunk_s
*
p_next
;
struct
riffchunk_s
*
p_next
;
struct
riffchunk_s
*
p_subchunk
;
struct
riffchunk_s
*
p_subchunk
;
}
riffchunk_t
;
}
riffchunk_t
;
/* ttes ces fonctions permettent un acces lineaire sans avoir besoin de revenrir en arriere */
static
riffchunk_t
*
RIFF_ReadChunk
(
input_thread_t
*
p_input
);
static
riffchunk_t
*
RIFF_ReadChunk
(
input_thread_t
*
p_input
);
static
int
RIFF_NextChunk
(
input_thread_t
*
p_input
,
riffchunk_t
*
p_rifffather
);
static
int
RIFF_NextChunk
(
input_thread_t
*
p_input
,
riffchunk_t
*
p_rifffather
);
static
int
RIFF_DescendChunk
(
input_thread_t
*
p_input
);
static
int
RIFF_DescendChunk
(
input_thread_t
*
p_input
);
...
@@ -58,7 +57,7 @@ static char * RIFF_IToStr(u32 i);
...
@@ -58,7 +57,7 @@ static char * RIFF_IToStr(u32 i);
********************************************/
********************************************/
static
int
__RIFF_TellPos
(
input_thread_t
*
p_input
,
u32
*
pos
)
static
int
__RIFF_TellPos
(
input_thread_t
*
p_input
,
u32
*
pos
)
{
/* pas sur que ca marche */
{
u32
i
;
u32
i
;
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
...
@@ -99,6 +98,7 @@ static int __RIFF_SkipBytes(input_thread_t * p_input,int nb)
...
@@ -99,6 +98,7 @@ static int __RIFF_SkipBytes(input_thread_t * p_input,int nb)
if
(
i
<
0
)
{
return
(
-
1
);
}
if
(
i
<
0
)
{
return
(
-
1
);
}
i_rest
-=
i
;
i_rest
-=
i
;
input_DeletePacket
(
p_input
->
p_method_data
,
p_pack
);
input_DeletePacket
(
p_input
->
p_method_data
,
p_pack
);
if
(
(
i
==
0
)
&&
(
i_rest
!=
0
))
{
return
(
-
1
);
}
}
}
}
}
return
(
0
);
return
(
0
);
...
...
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