Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
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
GSoC
GSoC2018
macOS
vlc
Commits
ffdca9af
Commit
ffdca9af
authored
Jan 25, 2004
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Stringreview !!!
parent
97706e46
Changes
52
Hide whitespace changes
Inline
Side-by-side
Showing
52 changed files
with
550 additions
and
307 deletions
+550
-307
modules/demux/a52sys.c
modules/demux/a52sys.c
+2
-2
modules/demux/aac.c
modules/demux/aac.c
+2
-2
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+4
-4
modules/demux/asf/libasf.c
modules/demux/asf/libasf.c
+19
-19
modules/demux/asf/libasf.h
modules/demux/asf/libasf.h
+2
-2
modules/demux/au.c
modules/demux/au.c
+2
-2
modules/demux/avi/avi.c
modules/demux/avi/avi.c
+19
-13
modules/demux/avi/avi.h
modules/demux/avi/avi.h
+2
-2
modules/demux/avi/libavi.c
modules/demux/avi/libavi.c
+5
-5
modules/demux/avi/libavi.h
modules/demux/avi/libavi.h
+3
-2
modules/demux/demux2.c
modules/demux/demux2.c
+2
-2
modules/demux/demuxdump.c
modules/demux/demuxdump.c
+10
-11
modules/demux/demuxstream.c
modules/demux/demuxstream.c
+5
-6
modules/demux/dvdnav.c
modules/demux/dvdnav.c
+8
-8
modules/demux/flac.c
modules/demux/flac.c
+5
-5
modules/demux/livedotcom.cpp
modules/demux/livedotcom.cpp
+8
-8
modules/demux/m3u.c
modules/demux/m3u.c
+5
-5
modules/demux/mkv.cpp
modules/demux/mkv.cpp
+10
-10
modules/demux/mod.c
modules/demux/mod.c
+14
-14
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+55
-55
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+2
-2
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+4
-4
modules/demux/mp4/mp4.h
modules/demux/mp4/mp4.h
+2
-2
modules/demux/mpeg/mpga.c
modules/demux/mpeg/mpga.c
+2
-2
modules/demux/mpeg/mpgv.c
modules/demux/mpeg/mpgv.c
+2
-2
modules/demux/mpeg/ps.c
modules/demux/mpeg/ps.c
+2
-2
modules/demux/mpeg/system.c
modules/demux/mpeg/system.c
+4
-4
modules/demux/mpeg/ts.c
modules/demux/mpeg/ts.c
+7
-7
modules/demux/nsv.c
modules/demux/nsv.c
+6
-6
modules/demux/ogg.c
modules/demux/ogg.c
+7
-7
modules/demux/playlist/m3u.c
modules/demux/playlist/m3u.c
+2
-2
modules/demux/playlist/old.c
modules/demux/playlist/old.c
+2
-2
modules/demux/playlist/playlist.c
modules/demux/playlist/playlist.c
+1
-2
modules/demux/playlist/pls.c
modules/demux/playlist/pls.c
+3
-3
modules/demux/ps.c
modules/demux/ps.c
+2
-2
modules/demux/rawdv.c
modules/demux/rawdv.c
+2
-2
modules/demux/real.c
modules/demux/real.c
+3
-3
modules/demux/ts.c
modules/demux/ts.c
+9
-10
modules/demux/util/id3.c
modules/demux/util/id3.c
+2
-2
modules/demux/util/id3genres.h
modules/demux/util/id3genres.h
+2
-2
modules/demux/util/id3tag.c
modules/demux/util/id3tag.c
+9
-9
modules/demux/util/sub.c
modules/demux/util/sub.c
+243
-15
modules/demux/util/sub.h
modules/demux/util/sub.h
+2
-1
modules/video_filter/adjust.c
modules/video_filter/adjust.c
+5
-4
modules/video_filter/clone.c
modules/video_filter/clone.c
+5
-4
modules/video_filter/crop.c
modules/video_filter/crop.c
+5
-4
modules/video_filter/deinterlace/deinterlace.c
modules/video_filter/deinterlace/deinterlace.c
+6
-5
modules/video_filter/distort.c
modules/video_filter/distort.c
+5
-4
modules/video_filter/logo.c
modules/video_filter/logo.c
+7
-5
modules/video_filter/motionblur.c
modules/video_filter/motionblur.c
+5
-3
modules/video_filter/transform.c
modules/video_filter/transform.c
+5
-4
modules/video_filter/wall.c
modules/video_filter/wall.c
+5
-4
No files found.
modules/demux/a52sys.c
View file @
ffdca9af
/*****************************************************************************
* a52.c : Raw A/52 Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: a52sys.c,v 1.1
1 2003/12/22 02:24:52 sam
Exp $
* Copyright (C) 2001
-2003
VideoLAN
* $Id: a52sys.c,v 1.1
2 2004/01/25 20:05:28 hartman
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
modules/demux/aac.c
View file @
ffdca9af
/*****************************************************************************
* aac.c : Raw aac Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: aac.c,v 1.
8 2003/11/21 00:38:01 gbazi
n Exp $
* Copyright (C) 2001
-2003
VideoLAN
* $Id: aac.c,v 1.
9 2004/01/25 20:05:28 hartma
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
modules/demux/asf/asf.c
View file @
ffdca9af
/*****************************************************************************
* asf.c : ASF
v01 file input module for vlc
* asf.c : ASF
demux module
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: asf.c,v 1.4
8 2004/01/05 13:00:20 zorglub
Exp $
* $Id: asf.c,v 1.4
9 2004/01/25 20:05:28 hartman
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -285,7 +285,7 @@ static int Open( vlc_object_t * p_this )
}
/* We add all info about this stream */
p_cat
=
input_InfoCategory
(
p_input
,
"Asf"
);
p_cat
=
input_InfoCategory
(
p_input
,
_
(
"Asf"
)
);
playlist_t
*
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_input
,
VLC_OBJECT_PLAYLIST
,
FIND_PARENT
);
if
(
p_sys
->
i_length
>
0
)
...
...
@@ -486,7 +486,7 @@ static void Close( vlc_object_t * p_this )
demux_sys_t
*
p_sys
=
p_input
->
p_demux_data
;
int
i_stream
;
msg_Dbg
(
p_input
,
"
F
reeing all memory"
);
msg_Dbg
(
p_input
,
"
f
reeing all memory"
);
ASF_FreeObjectRoot
(
p_input
->
s
,
p_sys
->
p_root
);
for
(
i_stream
=
0
;
i_stream
<
128
;
i_stream
++
)
...
...
modules/demux/asf/libasf.c
View file @
ffdca9af
/*****************************************************************************
* libasf.c :
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libasf.c,v 1.1
8 2003/09/07 22:48:29 fenrir
Exp $
* Copyright (C) 2001
-2003
VideoLAN
* $Id: libasf.c,v 1.1
9 2004/01/25 20:05:28 hartman
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -89,7 +89,7 @@ static int ASF_ReadObjectCommon( stream_t *s, asf_object_t *p_obj )
p_common
->
p_next
=
NULL
;
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Found O
bject guid: "
GUID_FMT
" size:"
I64Fd
,
"
found o
bject guid: "
GUID_FMT
" size:"
I64Fd
,
GUID_PRINT
(
p_common
->
i_object_id
),
p_common
->
i_object_size
);
#endif
...
...
@@ -153,7 +153,7 @@ static int ASF_ReadObject_Header( stream_t *s, asf_object_t *p_obj )
p_hdr
->
p_last
=
NULL
;
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Read
\"
Header O
bject
\"
subobj:%d, reserved1:%d, reserved2:%d"
,
"
read
\"
header o
bject
\"
subobj:%d, reserved1:%d, reserved2:%d"
,
p_hdr
->
i_sub_object_count
,
p_hdr
->
i_reserved1
,
p_hdr
->
i_reserved2
);
...
...
@@ -193,7 +193,7 @@ static int ASF_ReadObject_Data( stream_t *s, asf_object_t *p_obj )
p_data
->
i_reserved
=
GetWLE
(
p_peek
+
48
);
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Read
\"
Data O
bject
\"
file_id:"
GUID_FMT
" total data packet:"
"
read
\"
data o
bject
\"
file_id:"
GUID_FMT
" total data packet:"
I64Fd
" reserved:%d"
,
GUID_PRINT
(
p_data
->
i_file_id
),
p_data
->
i_total_data_packets
,
...
...
@@ -220,7 +220,7 @@ static int ASF_ReadObject_Index( stream_t *s, asf_object_t *p_obj )
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Read
\"
Index O
bject
\"
file_id:"
GUID_FMT
"
read
\"
index o
bject
\"
file_id:"
GUID_FMT
" index_entry_time_interval:"
I64Fd
" max_packet_count:%d "
"index_entry_count:%ld"
,
GUID_PRINT
(
p_index
->
i_file_id
),
...
...
@@ -261,7 +261,7 @@ static int ASF_ReadObject_file_properties( stream_t *s, asf_object_t *p_obj )
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Read
\"
File Properties O
bject
\"
file_id:"
GUID_FMT
"
read
\"
file properties o
bject
\"
file_id:"
GUID_FMT
" file_size:"
I64Fd
" creation_date:"
I64Fd
" data_packets_count:"
I64Fd
" play_duration:"
I64Fd
" send_duration:"
I64Fd
" preroll:"
I64Fd
" flags:%d min_data_packet_size:%d max_data_packet_size:%d "
...
...
@@ -307,7 +307,7 @@ static int ASF_ReadObject_header_extention( stream_t *s, asf_object_t *p_obj )
}
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Read
\"
Header Extention O
bject
\"
reserved1:"
GUID_FMT
" reserved2:%d header_extention_size:%d"
,
"
read
\"
header extention o
bject
\"
reserved1:"
GUID_FMT
" reserved2:%d header_extention_size:%d"
,
GUID_PRINT
(
p_he
->
i_reserved1
),
p_he
->
i_reserved2
,
p_he
->
i_header_extention_size
);
...
...
@@ -365,7 +365,7 @@ static int ASF_ReadObject_stream_properties( stream_t *s, asf_object_t *p_obj )
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Read
\"
Stream Properties O
bject
\"
stream_type:"
GUID_FMT
"
read
\"
stream Properties o
bject
\"
stream_type:"
GUID_FMT
" error_correction_type:"
GUID_FMT
" time_offset:"
I64Fd
" type_specific_data_length:%d error_correction_data_length:%d"
" flags:0x%x stream_number:%d"
,
...
...
@@ -463,7 +463,7 @@ static int ASF_ReadObject_codec_list( stream_t *s, asf_object_t *p_obj )
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Read
\"
Codec List O
bject
\"
reserved_guid:"
GUID_FMT
" codec_entries_count:%d"
,
"
read
\"
codec list o
bject
\"
reserved_guid:"
GUID_FMT
" codec_entries_count:%d"
,
GUID_PRINT
(
p_cl
->
i_reserved
),
p_cl
->
i_codec_entries_count
);
...
...
@@ -471,7 +471,7 @@ static int ASF_ReadObject_codec_list( stream_t *s, asf_object_t *p_obj )
{
#define codec p_cl->codec[i_codec]
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
Read
\"
Codec List O
bject
\"
codec[%d] %s name:
\"
%s
\"
description:
\"
%s
\"
information_length:%d"
,
"
read
\"
codec list o
bject
\"
codec[%d] %s name:
\"
%s
\"
description:
\"
%s
\"
information_length:%d"
,
i_codec
,
(
codec
.
i_type
==
ASF_CODEC_TYPE_VIDEO
)
?
"video"
:
(
(
codec
.
i_type
==
ASF_CODEC_TYPE_AUDIO
)
?
"audio"
:
"unknown"
),
codec
.
psz_name
,
...
...
@@ -546,7 +546,7 @@ static int ASF_ReadObject_content_description(stream_t *s, asf_object_t *p_obj)
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"Read
\"
Content Description O
bject
\"
title:
\"
%s
\"
author:
\"
%s
\"
copyright:
\"
%s
\"
description:
\"
%s
\"
rating:
\"
%s
\"
"
,
"Read
\"
content description o
bject
\"
title:
\"
%s
\"
author:
\"
%s
\"
copyright:
\"
%s
\"
description:
\"
%s
\"
rating:
\"
%s
\"
"
,
p_cd
->
psz_title
,
p_cd
->
psz_author
,
p_cd
->
psz_copyright
,
...
...
@@ -601,7 +601,7 @@ static int ASF_ReadObject( stream_t *s,
}
if
(
ASF_ReadObjectCommon
(
s
,
p_obj
)
)
{
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
C
annot read one asf object"
);
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
c
annot read one asf object"
);
return
VLC_EGENERIC
;
}
p_obj
->
common
.
p_father
=
p_father
;
...
...
@@ -612,7 +612,7 @@ static int ASF_ReadObject( stream_t *s,
if
(
p_obj
->
common
.
i_object_size
<
24
)
{
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
F
ound a corrupted asf object (size<24)"
);
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
f
ound a corrupted asf object (size<24)"
);
return
VLC_EGENERIC
;
}
/* find this object */
...
...
@@ -631,7 +631,7 @@ static int ASF_ReadObject( stream_t *s,
/* Now load this object */
if
(
ASF_Object_Function
[
i_index
].
ASF_ReadObject_function
==
NULL
)
{
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
U
nknown asf object (not loaded)"
);
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
u
nknown asf object (not loaded)"
);
i_result
=
VLC_SUCCESS
;
}
else
...
...
@@ -694,14 +694,14 @@ static void ASF_FreeObject( stream_t *s, asf_object_t *p_obj )
if
(
ASF_Object_Function
[
i_index
].
ASF_FreeObject_function
==
NULL
)
{
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
U
nknown asf object "
GUID_FMT
,
"
u
nknown asf object "
GUID_FMT
,
GUID_PRINT
(
p_obj
->
common
.
i_object_id
)
);
}
else
{
#ifdef ASF_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
F
ree asf object "
GUID_FMT
,
"
f
ree asf object "
GUID_FMT
,
GUID_PRINT
(
p_obj
->
common
.
i_object_id
)
);
#endif
(
ASF_Object_Function
[
i_index
].
ASF_FreeObject_function
)(
p_obj
);
...
...
@@ -750,7 +750,7 @@ asf_object_root_t *ASF_ReadObjectRoot( stream_t *s, int b_seekable )
p_root
->
p_index
=
(
asf_object_index_t
*
)
p_obj
;
break
;
default:
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
Unknow O
bject found"
);
msg_Warn
(
(
vlc_object_t
*
)
s
,
"
unknow o
bject found"
);
break
;
}
if
(
p_obj
->
common
.
i_type
==
ASF_OBJECT_TYPE_DATA
&&
...
...
@@ -780,7 +780,7 @@ asf_object_root_t *ASF_ReadObjectRoot( stream_t *s, int b_seekable )
{
return
p_root
;
}
msg_Warn
(
(
vlc_object_t
*
)
s
,
"cannot fin
e
file properties object"
);
msg_Warn
(
(
vlc_object_t
*
)
s
,
"cannot fin
d
file properties object"
);
}
/* Invalid file */
...
...
modules/demux/asf/libasf.h
View file @
ffdca9af
/*****************************************************************************
* libasf.h :
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libasf.h,v 1.
7 2003/08/18 19:18:47 fenrir
Exp $
* Copyright (C) 2001
-2003
VideoLAN
* $Id: libasf.h,v 1.
8 2004/01/25 20:05:28 hartman
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
modules/demux/au.c
View file @
ffdca9af
...
...
@@ -2,7 +2,7 @@
* au.c : au file input module for vlc
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: au.c,v 1.1
1 2003/11/21 00:38:01 gbazi
n Exp $
* $Id: au.c,v 1.1
2 2004/01/25 20:05:28 hartma
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -336,7 +336,7 @@ static int DemuxPCM( input_thread_t *p_input )
i_pos
+=
p_sys
->
fmt
.
audio
.
i_blockalign
-
i_pos
%
p_sys
->
fmt
.
audio
.
i_blockalign
;
if
(
stream_Seek
(
p_input
->
s
,
i_pos
)
)
{
msg_Err
(
p_input
,
"
Seek failed
(cannot resync)"
);
msg_Err
(
p_input
,
"
seek failed
(cannot resync)"
);
}
}
}
...
...
modules/demux/avi/avi.c
View file @
ffdca9af
/*****************************************************************************
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.8
4 2004/01/05 13:00:20 zorglub
Exp $
* Copyright (C) 2001
-2004
VideoLAN
* $Id: avi.c,v 1.8
5 2004/01/25 20:05:28 hartman
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -36,20 +36,26 @@
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define INTERLEAVE_TEXT N_("Force interleaved method" )
#define INTERLEAVE_LONGTEXT N_( "Force interleaved method" )
#define INDEX_TEXT N_("Force index creation")
#define INDEX_LONGTEXT N_( \
"Recreate a index for the AVI file so we can seek trough it more reliably." )
static
int
Open
(
vlc_object_t
*
);
static
void
Close
(
vlc_object_t
*
);
vlc_module_begin
();
add_category_hint
(
N_
(
"AVI demuxer"
),
NULL
,
VLC_TRUE
);
add_bool
(
"avi-interleaved"
,
0
,
NULL
,
N_
(
"force interleaved method"
),
N_
(
"force interleaved method"
),
VLC_TRUE
);
add_bool
(
"avi-index"
,
0
,
NULL
,
N_
(
"force index creation"
),
N_
(
"force index creation"
),
VLC_TRUE
);
set_description
(
N_
(
"AVI demuxer"
)
);
set_description
(
_
(
"AVI demuxer"
)
);
set_capability
(
"demux"
,
212
);
add_bool
(
"avi-interleaved"
,
0
,
NULL
,
INTERLEAVE_TEXT
,
INTERLEAVE_LONGTEXT
,
VLC_TRUE
);
add_bool
(
"avi-index"
,
0
,
NULL
,
INDEX_TEXT
,
INDEX_LONGTEXT
,
VLC_TRUE
);
set_callbacks
(
Open
,
Close
);
vlc_module_end
();
...
...
@@ -356,7 +362,7 @@ static int Open( vlc_object_t * p_this )
if
(
p_sys
->
i_track
<=
0
)
{
msg_Err
(
p_input
,
"
N
o valid track"
);
msg_Err
(
p_input
,
"
n
o valid track"
);
goto
error
;
}
...
...
@@ -1072,7 +1078,7 @@ static int Seek( input_thread_t *p_input, mtime_t i_date, int i_percent )
/* p_sys->i_time = __MAX( AVI_GetPTS( p_stream ), p_sys->i_time );*/
}
}
msg_Dbg
(
p_input
,
"seek: "
I64Fd
" second
e
s"
,
p_sys
->
i_time
/
1000000
);
msg_Dbg
(
p_input
,
"seek: "
I64Fd
" seconds"
,
p_sys
->
i_time
/
1000000
);
/* set true movie time */
#endif
if
(
!
p_sys
->
i_time
)
...
...
modules/demux/avi/avi.h
View file @
ffdca9af
/*****************************************************************************
* avi.h : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.h,v 1.1
8 2004/01/04 17:35:02 fenrir
Exp $
* Copyright (C) 2001
-2004
VideoLAN
* $Id: avi.h,v 1.1
9 2004/01/25 20:05:28 hartman
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
modules/demux/avi/libavi.c
View file @
ffdca9af
/*****************************************************************************
* libavi.c :
* libavi.c :
LibAVI
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libavi.c,v 1.
29 2003/10/24 12:22:51 fenrir
Exp $
* $Id: libavi.c,v 1.
30 2004/01/25 20:05:28 hartman
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -71,7 +71,7 @@ static int AVI_ChunkReadCommon( stream_t *s, avi_chunk_t *p_chk )
#ifdef AVI_DEBUG
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
F
ound Chunk fourcc:%8.8x (%4.4s) size:"
I64Fd
" pos:"
I64Fd
,
"
f
ound Chunk fourcc:%8.8x (%4.4s) size:"
I64Fd
" pos:"
I64Fd
,
p_chk
->
common
.
i_chunk_fourcc
,
(
char
*
)
&
p_chk
->
common
.
i_chunk_fourcc
,
p_chk
->
common
.
i_chunk_size
,
...
...
@@ -137,7 +137,7 @@ static int AVI_ChunkRead_list( stream_t *s, avi_chunk_t *p_container )
if
(
p_container
->
common
.
i_chunk_fourcc
==
AVIFOURCC_LIST
&&
p_container
->
list
.
i_type
==
AVIFOURCC_movi
)
{
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
S
kipping movi chunk"
);
msg_Dbg
(
(
vlc_object_t
*
)
s
,
"
s
kipping movi chunk"
);
if
(
b_seekable
)
{
return
AVI_NextChunk
(
s
,
p_container
);
...
...
@@ -580,7 +580,7 @@ static struct
{
AVIFOURCC_ICRP
,
"cropped"
},
{
AVIFOURCC_IDIM
,
"dimensions"
},
{
AVIFOURCC_IDPI
,
"dots per inch"
},
{
AVIFOURCC_IENG
,
"engin
n
er"
},
{
AVIFOURCC_IENG
,
"engin
e
er"
},
{
AVIFOURCC_IGNR
,
"genre"
},
{
AVIFOURCC_IKEY
,
"keywords"
},
{
AVIFOURCC_ILGT
,
"lightness"
},
...
...
modules/demux/avi/libavi.h
View file @
ffdca9af
/*****************************************************************************
* libavi.h : LibAVI library
******************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libavi.h,v 1.1
3 2003/11/30 22:14:39 fenrir
Exp $
* Copyright (C) 2001
-2003
VideoLAN
* $Id: libavi.h,v 1.1
4 2004/01/25 20:05:28 hartman
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -19,6 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/* flags for use in <dwFlags> in AVIFileHdr */
#define AVIF_HASINDEX 0x00000010
/* Index at end of file? */
#define AVIF_MUSTUSEINDEX 0x00000020
...
...
modules/demux/demux2.c
View file @
ffdca9af
...
...
@@ -2,7 +2,7 @@
* demux2 adaptation layer.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: demux2.c,v 1.
6 2004/01/20 14:51:30 fenrir
Exp $
* $Id: demux2.c,v 1.
7 2004/01/25 20:05:28 hartman
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -38,7 +38,7 @@ static int Demux2Open ( vlc_object_t * );
static
void
Demux2Close
(
vlc_object_t
*
);
vlc_module_begin
();
set_description
(
_
(
"
d
emux2 adaptation layer"
)
);
set_description
(
_
(
"
D
emux2 adaptation layer"
)
);
set_capability
(
"demux"
,
2
);
set_callbacks
(
Demux2Open
,
Demux2Close
);
add_shortcut
(
"demux2"
);
...
...
modules/demux/demuxdump.c
View file @
ffdca9af
/*****************************************************************************
* demuxdump.c : Pseudo demux module for vlc (dump raw stream)
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: demuxdump.c,v 1.1
1 2003/11/05 17:57:29 gbazi
n Exp $
* Copyright (C) 2001
-2003
VideoLAN
* $Id: demuxdump.c,v 1.1
2 2004/01/25 20:05:28 hartma
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -38,24 +38,23 @@
*****************************************************************************/
static
int
Activate
(
vlc_object_t
*
);
static
int
Demux
(
input_thread_t
*
);
static
void
De
s
activate
(
vlc_object_t
*
);
static
void
Deactivate
(
vlc_object_t
*
);
#define DUMP_BLOCKSIZE 16384
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define FILE_TEXT N_("
Dump file name
")
#define FILE_TEXT N_("
Filename of dump
")
#define FILE_LONGTEXT N_( \
"Specify a file name to which the raw stream will be dumped." )
vlc_module_begin
();
set_description
(
_
(
"
file
dump demuxer"
)
);
set_description
(
_
(
"
File
dump demuxer"
)
);
set_capability
(
"demux"
,
0
);
add_category_hint
(
"File"
,
NULL
,
VLC_FALSE
);
add_file
(
"demuxdump-file"
,
"stream-demux.dump"
,
NULL
,
FILE_TEXT
,
FILE_LONGTEXT
,
VLC_FALSE
);
set_callbacks
(
Activate
,
Desactivate
);
add_file
(
"demuxdump-file"
,
"stream-demux.dump"
,
NULL
,
FILE_TEXT
,
FILE_LONGTEXT
,
VLC_FALSE
);
set_callbacks
(
Activate
,
Deactivate
);
add_shortcut
(
"dump"
);
vlc_module_end
();
...
...
@@ -164,9 +163,9 @@ static int Activate( vlc_object_t * p_this )
}
/*****************************************************************************
* De
s
ctivate: initializes dump structures
* De
a
ctivate: initializes dump structures
*****************************************************************************/
static
void
De
s
activate
(
vlc_object_t
*
p_this
)
static
void
Deactivate
(
vlc_object_t
*
p_this
)
{
input_thread_t
*
p_input
=
(
input_thread_t
*
)
p_this
;
demux_sys_t
*
p_demux
=
(
demux_sys_t
*
)
p_input
->
p_demux_data
;
...
...
modules/demux/demuxstream.c
View file @
ffdca9af
...
...
@@ -2,7 +2,7 @@
* demuxstream.c: Read an MPEG stream from the satellite and stream it
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: demuxstream.c,v 1.
1 2003/11/06 16:06:28 massiot
Exp $
* $Id: demuxstream.c,v 1.
2 2004/01/25 20:05:28 hartman
Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
...
...
@@ -140,7 +140,6 @@ vlc_module_begin();
set_capability
(
"demux"
,
0
);
add_shortcut
(
"demuxstream"
);
#endif
add_category_hint
(
N_
(
"Miscellaneous"
),
NULL
,
VLC_TRUE
);
add_bool
(
"vls-backwards-compat"
,
0
,
NULL
,
VLS_BACKWARDS_COMPAT_TEXT
,
VLS_BACKWARDS_COMPAT_LONGTEXT
,
VLC_TRUE
);
add_bool
(
"buggy-psi"
,
0
,
NULL
,
BUGGY_PSI_TEXT
,
BUGGY_PSI_LONGTEXT
,
VLC_TRUE
);
...
...
@@ -1283,7 +1282,7 @@ static void TS_DVBPSI_HandlePAT( input_thread_t * p_input,
(
p_new_pat
->
i_version
!=
p_stream_data
->
i_pat_version
)
)
||
p_stream_data
->
i_pat_version
==
PAT_UNINITIALIZED
)
{
msg_Dbg
(
p_input
,
"
P
rocessing PAT version %d"
,
p_new_pat
->
i_version
);
msg_Dbg
(
p_input
,
"
p
rocessing PAT version %d"
,
p_new_pat
->
i_version
);
/* Delete all programs */
while
(
p_input
->
stream
.
i_pgrm_number
)
...
...
@@ -1308,7 +1307,7 @@ static void TS_DVBPSI_HandlePAT( input_thread_t * p_input,
while
(
p_pgrm
)
{
msg_Dbg
(
p_input
,
"
N
ew program: %d"
,
p_pgrm
->
i_number
);
msg_Dbg
(
p_input
,
"
n
ew program: %d"
,
p_pgrm
->
i_number
);
/* If program = 0, we're having info about NIT not PMT */
if
(
p_pgrm
->
i_number
)
...
...
@@ -1386,7 +1385,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
dvbpsi_descriptor_t
*
p_dr
=
p_new_pmt
->
p_first_descriptor
;
int
i_loop
;
msg_Dbg
(
p_input
,
"
P
rocessing PMT for program %d version %d"
,
msg_Dbg
(
p_input
,
"
p
rocessing PMT for program %d version %d"
,
p_new_pmt
->
i_program_number
,
p_new_pmt
->
i_version
);
/* Delete all ES in this program except the PSI. We start from the
...
...
@@ -1717,7 +1716,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
if
(
i_fourcc
==
VLC_FOURCC
(
0
,
0
,
0
,
0
)
)
{
msg_Warn
(
p_input
,
"
U
nknown codec/type for Private PES stream"
);
"
u
nknown codec/type for Private PES stream"
);
}
}
...
...
modules/demux/dvdnav.c
View file @
ffdca9af
...
...
@@ -2,7 +2,7 @@
* dvdnav.c: DVD module using the dvdnav library.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: dvdnav.c,v 1.
7 2004/01/19 21:30:43 fenrir
Exp $
* $Id: dvdnav.c,v 1.
8 2004/01/25 20:05:28 hartman
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -51,15 +51,15 @@ static int DemuxOpen ( vlc_object_t * );
static
void
DemuxClose
(
vlc_object_t
*
);
vlc_module_begin
();
set_description
(
"DVDnav Input"
);
add_
category_hint
(
N_
(
"DVD"
),
NULL
,
VLC_TRUE
);
add_integer
(
"dvdnav-caching"
,
DEFAULT_PTS_DELAY
/
1000
,
NULL
,
CACHING_TEXT
,
CACHING_LONGTEXT
,
VLC_TRUE
);
set_description
(
_
(
"DVDnav Input"
)
);
add_
integer
(
"dvdnav-caching"
,
DEFAULT_PTS_DELAY
/
1000
,
NULL
,
CACHING_TEXT
,
CACHING_LONGTEXT
,
VLC_TRUE
);
set_capability
(
"access"
,
0
);
add_shortcut
(
"dvdnav"
);
set_callbacks
(
AccessOpen
,
AccessClose
);
add_submodule
();
set_description
(
"DVDnav Input (demux)"
);
set_description
(
_
(
"DVDnav Input (demux)"
)
);
set_capability
(
"demux2"
,
1
);
add_shortcut
(
"dvdnav"
);
set_callbacks
(
DemuxOpen
,
DemuxClose
);
...
...
@@ -330,7 +330,7 @@ static int DemuxOpen( vlc_object_t *p_this )
/* Configure dvdnav */
if
(
dvdnav_set_readahead_flag
(
p_sys
->
dvdnav
,
1
)
!=
DVDNAV_STATUS_OK
)
{
msg_Warn
(
p_demux
,
"cannot set read
a
head flag"
);
msg_Warn
(
p_demux
,
"cannot set read
-a-
head flag"
);
}
if
(
dvdnav_set_PGC_positioning_flag
(
p_sys
->
dvdnav
,
1
)
!=
...
...
@@ -711,11 +711,11 @@ static void ButtonUpdate( demux_t *p_demux )
val
.
b_bool
=
VLC_TRUE
;
var_Set
(
p_sys
->
p_input
,
"highlight"
,
val
);
vlc_mutex_unlock
(
p_mutex
);
msg_Dbg
(
p_demux
,
"
B
uttonUpdate %d"
,
i_button
);
msg_Dbg
(
p_demux
,
"
b
uttonUpdate %d"
,
i_button
);
}
else
{
msg_Dbg
(
p_demux
,
"
B
uttonUpdate not done b=%d t=%d"
,
i_button
,
i_title
);
msg_Dbg
(
p_demux
,
"
b
uttonUpdate not done b=%d t=%d"
,
i_button
,
i_title
);
/* Show all */
vlc_mutex_lock
(
p_mutex
);
...
...
modules/demux/flac.c
View file @
ffdca9af
/*****************************************************************************
* flac.c : FLAC demux module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: flac.c,v 1.
9 2003/11/24 00:39:01 fenrir
Exp $
* Copyright (C) 2001
-2003
VideoLAN
* $Id: flac.c,v 1.
10 2004/01/25 20:05:28 hartman
Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
...
...
@@ -51,7 +51,7 @@ struct demux_sys_t
* Module descriptor
*****************************************************************************/
vlc_module_begin
();
set_description
(
_
(
"
flac
demuxer"
)
);
set_description
(
_
(
"
FLAC
demuxer"
)
);
set_capability
(
"demux"
,
155
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"flac"
);
...
...
@@ -103,13 +103,13 @@ static int Open( vlc_object_t * p_this )
i_peek
=
stream_Peek
(
p_input
->
s
,
&
p_peek
,
8
);
if
(
p_peek
[
4
]
&
0x7F
)
{
msg_Err
(
p_input
,
"
T
his isn't a STREAMINFO metadata block"
);
msg_Err
(
p_input
,
"
t
his isn't a STREAMINFO metadata block"
);
return
VLC_EGENERIC
;
}
if
(
((
p_peek
[
5
]
<<
16
)
+
(
p_peek
[
6
]
<<
8
)
+
p_peek
[
7
])
!=
(
STREAMINFO_SIZE
-
4
)
)
{
msg_Err
(
p_input
,
"
I
nvalid size for a STREAMINFO metadata block"
);
msg_Err
(
p_input
,
"
i
nvalid size for a STREAMINFO metadata block"
);
return
VLC_EGENERIC
;
}
...
...
modules/demux/livedotcom.cpp
View file @
ffdca9af
...
...
@@ -2,7 +2,7 @@
* live.cpp : live.com support.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: livedotcom.cpp,v 1.1
3 2003/12/04 18:13:28 gbazi
n Exp $
* $Id: livedotcom.cpp,v 1.1
4 2004/01/25 20:05:28 hartma
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -51,7 +51,7 @@ static void DemuxClose( vlc_object_t * );
static
int
AccessOpen
(
vlc_object_t
*
);
static
void
AccessClose
(
vlc_object_t
*
);
#define CACHING_TEXT N_("Caching value
in ms
")
#define CACHING_TEXT N_("Caching value
(ms)
")
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for rtsp streams. This " \
"value should be set in miliseconds units." )
...
...
@@ -68,11 +68,11 @@ vlc_module_begin();
add_shortcut
(
"sdp"
);
set_capability
(
"access"
,
0
);
set_callbacks
(
AccessOpen
,
AccessClose
);
add_
category_hint
(
N_
(
"RTSP"
),
NULL
,
VLC_TRUE
);
add_bool
(
"rtsp-tcp"
,
0
,
NULL
,
"Use rtp over rtsp(tcp)"
,
"Use rtp over rtsp(tcp)"
,
VLC_TRUE
);
add_integer
(
"rtsp-caching"
,
4
*
DEFAULT_PTS_DELAY
/
1000
,
NULL
,
CACHING_TEXT
,
CACHING_LONGTEXT
,
VLC_TRUE
);
add_
bool
(
"rtsp-tcp"
,
0
,
NULL
,
N_
(
"Use rtp over rtsp (tcp)"
)
,
N_
(
"Use rtp over rtsp (tcp)"
),
VLC_TRUE
);
add_integer
(
"rtsp-caching"
,
4
*
DEFAULT_PTS_DELAY
/
1000
,
NULL
,
CACHING_TEXT
,
CACHING_LONGTEXT
,
VLC_TRUE
);
vlc_module_end
();
/* TODO:
...
...
@@ -645,7 +645,7 @@ static int DemuxOpen ( vlc_object_t *p_this )
if
(
p_sys
->
i_track
<=
0
)
{
msg_Err
(
p_input
,
"
N
o codec supported, aborting"
);
msg_Err
(
p_input
,
"
n
o codec supported, aborting"
);
goto
error
;
}
...
...
modules/demux/m3u.c
View file @
ffdca9af
/*****************************************************************************
* m3u.c: a meta demux to parse pls, m3u, asx et b4s playlists
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: m3u.c,v 1.2
5 2004/01/05 13:07:02 zorglub
Exp $
* Copyright (C) 2001
-2004
VideoLAN
* $Id: m3u.c,v 1.2
6 2004/01/25 20:05:28 hartman
Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -60,7 +60,7 @@ static int Demux ( input_thread_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin
();
set_description
(
_
(
"
p
laylist metademux"
)
);
set_description
(
_
(
"
P
laylist metademux"
)
);
set_capability
(
"demux"
,
180
);
set_callbacks
(
Activate
,
Deactivate
);
add_shortcut
(
"m3u"
);
...
...
@@ -121,8 +121,8 @@ static int Activate( vlc_object_t * p_this )