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
6265a3ae
Commit
6265a3ae
authored
Mar 06, 2004
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Remove directories with only one source file inside
* Drop the old scope plugin (not ported to aout3)
parent
1778b48e
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
12 additions
and
256 deletions
+12
-256
configure.ac
configure.ac
+1
-9
modules/control/Modules.am
modules/control/Modules.am
+2
-0
modules/control/lirc.c
modules/control/lirc.c
+0
-0
modules/control/lirc/Modules.am
modules/control/lirc/Modules.am
+0
-1
modules/control/rc.c
modules/control/rc.c
+1
-1
modules/control/rc/Modules.am
modules/control/rc/Modules.am
+0
-1
modules/misc/Modules.am
modules/misc/Modules.am
+1
-0
modules/misc/logger.c
modules/misc/logger.c
+1
-1
modules/misc/logger/Modules.am
modules/misc/logger/Modules.am
+0
-1
modules/video_filter/Modules.am
modules/video_filter/Modules.am
+1
-0
modules/video_filter/deinterlace.c
modules/video_filter/deinterlace.c
+1
-1
modules/video_filter/deinterlace/Modules.am
modules/video_filter/deinterlace/Modules.am
+0
-1
modules/video_output/Modules.am
modules/video_output/Modules.am
+1
-0
modules/video_output/mga.c
modules/video_output/mga.c
+1
-1
modules/video_output/mga/Modules.am
modules/video_output/mga/Modules.am
+0
-1
modules/visualization/Modules.am
modules/visualization/Modules.am
+1
-0
modules/visualization/scope/Modules.am
modules/visualization/scope/Modules.am
+0
-1
modules/visualization/scope/scope.c
modules/visualization/scope/scope.c
+0
-235
modules/visualization/xosd.c
modules/visualization/xosd.c
+1
-1
modules/visualization/xosd/Modules.am
modules/visualization/xosd/Modules.am
+0
-1
No files found.
configure.ac
View file @
6265a3ae
dnl Autoconf settings for vlc
dnl $Id
: configure.ac,v 1.190 2004/03/05 14:03:20 garf Exp
$
dnl $Id$
AC_INIT(vlc,0.7.2-cvs)
...
...
@@ -890,7 +890,6 @@ AX_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_re
AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer])
AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
AX_ADD_PLUGINS([aout_file])
#AX_ADD_PLUGINS([scope])
AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
AX_ADD_PLUGINS([id3 m3u playlist export])
AX_ADD_PLUGINS([rawvideo])
...
...
@@ -3765,8 +3764,6 @@ AC_CONFIG_FILES([
modules/codec/spudec/Makefile
modules/control/Makefile
modules/control/corba/Makefile
modules/control/lirc/Makefile
modules/control/rc/Makefile
modules/control/telnet/Makefile
modules/demux/Makefile
modules/demux/asf/Makefile
...
...
@@ -3790,7 +3787,6 @@ AC_CONFIG_FILES([
modules/gui/wxwindows/Makefile
modules/misc/Makefile
modules/misc/dummy/Makefile
modules/misc/logger/Makefile
modules/misc/memcpy/Makefile
modules/misc/network/Makefile
modules/misc/testsuite/Makefile
...
...
@@ -3802,15 +3798,11 @@ AC_CONFIG_FILES([
modules/stream_out/transrate/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
modules/video_filter/deinterlace/Makefile
modules/video_output/Makefile
modules/video_output/directx/Makefile
modules/video_output/mga/Makefile
modules/video_output/qte/Makefile
modules/video_output/x11/Makefile
modules/visualization/Makefile
modules/visualization/scope/Makefile
modules/visualization/xosd/Makefile
modules/visualization/visual/Makefile
])
...
...
modules/control/Modules.am
View file @
6265a3ae
...
...
@@ -3,3 +3,5 @@ SOURCES_http = http.c
SOURCES_ntservice = ntservice.c
SOURCES_joystick = joystick.c
SOURCES_hotkeys = hotkeys.c
SOURCES_lirc = lirc.c
SOURCES_rc = rc.c
modules/control/lirc
/lirc
.c
→
modules/control/lirc.c
View file @
6265a3ae
File moved
modules/control/lirc/Modules.am
deleted
100644 → 0
View file @
1778b48e
SOURCES_lirc = lirc.c
modules/control/rc
/rc
.c
→
modules/control/rc.c
View file @
6265a3ae
...
...
@@ -2,7 +2,7 @@
* rc.c : remote control stdin/stdout module for vlc
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id
: rc.c,v 1.43 2004/01/25 20:40:59 gbazin Exp
$
* $Id$
*
* Author: Peter Surda <shurdeek@panorama.sth.ac.at>
*
...
...
modules/control/rc/Modules.am
deleted
100644 → 0
View file @
1778b48e
SOURCES_rc = rc.c
modules/misc/Modules.am
View file @
6265a3ae
...
...
@@ -6,3 +6,4 @@ SOURCES_sap = sap.c
SOURCES_screensaver = screensaver.c
SOURCES_qte_main = qte_main.cpp
SOURCES_freetype = freetype.c
SOURCES_logger = logger.c
modules/misc/logger
/logger
.c
→
modules/misc/logger.c
View file @
6265a3ae
...
...
@@ -2,7 +2,7 @@
* logger.c : file logging plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id
: logger.c,v 1.11 2004/01/25 17:52:17 gbazin Exp
$
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
...
...
modules/misc/logger/Modules.am
deleted
100644 → 0
View file @
1778b48e
SOURCES_logger = logger.c
modules/video_filter/Modules.am
View file @
6265a3ae
...
...
@@ -7,4 +7,5 @@ SOURCES_clone = clone.c
SOURCES_crop = crop.c
SOURCES_motionblur = motionblur.c
SOURCES_logo = logo.c
SOURCES_deinterlace = deinterlace.c
noinst_HEADERS += filter_common.h
modules/video_filter/deinterlace
/deinterlace
.c
→
modules/video_filter/deinterlace.c
View file @
6265a3ae
...
...
@@ -2,7 +2,7 @@
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
* $Id
: deinterlace.c,v 1.25 2004/03/04 22:47:42 sigmunau Exp
$
* $Id$
*
* Author: Sam Hocevar <sam@zoy.org>
*
...
...
modules/video_filter/deinterlace/Modules.am
deleted
100644 → 0
View file @
1778b48e
SOURCES_deinterlace = deinterlace.c
modules/video_output/Modules.am
View file @
6265a3ae
...
...
@@ -6,3 +6,4 @@ SOURCES_glide = glide.c
SOURCES_vout_sdl = sdl.c
SOURCES_svgalib = svgalib.c
SOURCES_wingdi = wingdi.c
SOURCES_mga = mga.c
modules/video_output/mga
/mga
.c
→
modules/video_output/mga.c
View file @
6265a3ae
...
...
@@ -2,7 +2,7 @@
* mga.c : Matrox Graphic Array plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id
: mga.c,v 1.3 2003/10/25 00:49:14 sam Exp
$
* $Id$
*
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Samuel Hocevar <sam@zoy.org>
...
...
modules/video_output/mga/Modules.am
deleted
100644 → 0
View file @
1778b48e
SOURCES_mga = mga.c
modules/visualization/Modules.am
View file @
6265a3ae
SOURCES_goom = goom.c
SOURCES_xosd = xosd.c
modules/visualization/scope/Modules.am
deleted
100644 → 0
View file @
1778b48e
SOURCES_scope = scope.c
modules/visualization/scope/scope.c
deleted
100644 → 0
View file @
1778b48e
/*****************************************************************************
* scope.c : Scope effect module
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: scope.c,v 1.4 2003/08/19 18:51:03 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <stdlib.h>
/* malloc(), free() */
#include <string.h>
/* strdup() */
#include <errno.h>
#include <vlc/vlc.h>
#include <vlc/aout.h>
#include <vlc/vout.h>
#include "aout_internal.h"
#define SCOPE_WIDTH 320
#define SCOPE_HEIGHT 240
#define SCOPE_ASPECT (VOUT_ASPECT_FACTOR*SCOPE_WIDTH/SCOPE_HEIGHT)
/*****************************************************************************
* aout_sys_t: scope audio output method descriptor
*****************************************************************************
* This structure is part of the audio output thread descriptor.
* It describes some scope specific variables.
*****************************************************************************/
typedef
struct
aout_filter_sys_t
{
aout_fifo_t
*
p_aout_fifo
;
vout_thread_t
*
p_vout
;
}
aout_filter_sys_t
;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static
int
Open
(
vlc_object_t
*
);
static
void
Close
(
vlc_object_t
*
);
static
void
DoWork
(
aout_instance_t
*
,
aout_filter_t
*
,
aout_buffer_t
*
,
aout_buffer_t
*
);
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin
();
set_description
(
_
(
"scope effect"
)
);
set_capability
(
"audio filter"
,
0
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"scope"
);
vlc_module_end
();
/*****************************************************************************
* Open: open a scope effect plugin
*****************************************************************************/
static
int
Open
(
vlc_object_t
*
p_this
)
{
aout_filter_t
*
p_aout
=
(
aout_filter_t
*
)
p_this
;
aout_filter_t
*
p_filter
=
(
aout_filter_t
*
)
p_this
;
if
(
p_filter
->
input
.
i_format
!=
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
)
//AOUT_FMT_U16_NE
||
p_filter
->
output
.
i_format
!=
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
)
)
//AOUT_FMT_U16_NE )
{
msg_Warn
(
p_filter
,
"Bad input or output format"
);
return
-
1
;
}
if
(
!
AOUT_FMTS_SIMILAR
(
&
p_filter
->
input
,
&
p_filter
->
output
)
)
{
msg_Warn
(
p_filter
,
"input and output formats are not similar"
);
return
-
1
;
}
p_filter
->
pf_do_work
=
DoWork
;
p_filter
->
b_in_place
=
1
;
/* Allocate structure */
p_aout
->
p_sys
=
malloc
(
sizeof
(
aout_filter_sys_t
)
);
if
(
p_aout
->
p_sys
==
NULL
)
{
msg_Err
(
p_aout
,
"out of memory"
);
return
-
1
;
}
/* Open video output */
p_aout
->
p_sys
->
p_vout
=
vout_Create
(
p_aout
,
SCOPE_WIDTH
,
SCOPE_HEIGHT
,
VLC_FOURCC
(
'I'
,
'4'
,
'2'
,
'0'
),
SCOPE_ASPECT
);
if
(
p_aout
->
p_sys
->
p_vout
==
NULL
)
{
msg_Err
(
p_aout
,
"no suitable vout module"
);
free
(
p_aout
->
p_sys
);
return
-
1
;
}
return
(
0
);
}
/*****************************************************************************
* Play: play a sound samples buffer
*****************************************************************************
* This function writes a buffer of i_length bytes in the socket
*****************************************************************************/
static
void
DoWork
(
aout_instance_t
*
p_aout
,
aout_filter_t
*
p_filter
,
aout_buffer_t
*
p_in_buf
,
aout_buffer_t
*
p_out_buf
)
{
picture_t
*
p_outpic
;
int
i_index
,
i_image
;
byte_t
*
p_buffer
=
p_in_buf
->
p_buffer
;
uint8_t
*
ppp_area
[
2
][
3
];
float
*
p_sample
;
p_out_buf
->
i_nb_samples
=
p_in_buf
->
i_nb_samples
;
p_out_buf
->
i_nb_bytes
=
p_in_buf
->
i_nb_bytes
;
for
(
i_image
=
0
;
(
i_image
+
1
)
*
SCOPE_WIDTH
<
p_in_buf
->
i_nb_samples
;
i_image
++
)
{
/* Don't stay here forever */
if
(
mdate
()
>=
p_in_buf
->
end_date
-
10000
)
{
break
;
}
/* This is a new frame. Get a structure from the video_output. */
while
(
(
p_outpic
=
vout_CreatePicture
(
p_filter
->
p_sys
->
p_vout
,
0
,
0
,
0
)
)
==
NULL
)
{
if
(
p_aout
->
b_die
)
{
return
;
}
msleep
(
1
);
/* Not sleeping here makes us use 100% cpu,
* sleeping too much absolutly kills audio
* quality. 1 seems to be a good value */
}
/* Blank the picture */
for
(
i_index
=
0
;
i_index
<
p_outpic
->
i_planes
;
i_index
++
)
{
memset
(
p_outpic
->
p
[
i_index
].
p_pixels
,
i_index
?
0x80
:
0x00
,
p_outpic
->
p
[
i_index
].
i_lines
*
p_outpic
->
p
[
i_index
].
i_pitch
);
}
/* We only support 2 channels for now */
for
(
i_index
=
0
;
i_index
<
2
;
i_index
++
)
{
int
j
;
for
(
j
=
0
;
j
<
3
;
j
++
)
{
ppp_area
[
i_index
][
j
]
=
p_outpic
->
p
[
j
].
p_pixels
+
3
*
i_index
*
p_outpic
->
p
[
j
].
i_lines
/
p_filter
->
input
.
i_original_channels
*
p_outpic
->
p
[
j
].
i_pitch
;
}
}
for
(
i_index
=
0
,
p_sample
=
(
float
*
)
p_buffer
;
i_index
<
SCOPE_WIDTH
;
i_index
++
)
{
int
i
;
int
i_tmp_value
;
uint8_t
i_right_value
,
i_left_value
;
if
(
*
p_sample
>=
1
.
0
)
i_tmp_value
=
32767
;
else
if
(
*
p_sample
<
-
1
.
0
)
i_tmp_value
=
-
32768
;
else
i_tmp_value
=
*
p_sample
*
32768
.
0
;
i_left_value
=
i_tmp_value
/
256
+
128
;
p_sample
++
;
if
(
*
p_sample
>=
1
.
0
)
i_tmp_value
=
32767
;
else
if
(
*
p_sample
<
-
1
.
0
)
i_tmp_value
=
-
32768
;
else
i_tmp_value
=
*
p_sample
*
32768
.
0
;
p_sample
++
;
i_right_value
=
i_tmp_value
/
256
+
128
;
for
(
i
=
0
;
i
<
2
;
i
++
)
{
/* Left channel */
*
(
ppp_area
[
0
][
0
]
+
p_outpic
->
p
[
0
].
i_pitch
*
i_index
/
SCOPE_WIDTH
+
p_outpic
->
p
[
0
].
i_lines
*
i_left_value
/
512
*
p_outpic
->
p
[
0
].
i_pitch
)
=
0xbf
;
*
(
ppp_area
[
0
][
1
]
+
p_outpic
->
p
[
1
].
i_pitch
*
i_index
/
SCOPE_WIDTH
+
p_outpic
->
p
[
1
].
i_lines
*
i_left_value
/
512
*
p_outpic
->
p
[
1
].
i_pitch
)
=
0xff
;
/* Right channel */
*
(
ppp_area
[
1
][
0
]
+
p_outpic
->
p
[
0
].
i_pitch
*
i_index
/
SCOPE_WIDTH
+
p_outpic
->
p
[
0
].
i_lines
*
i_right_value
/
512
*
p_outpic
->
p
[
0
].
i_pitch
)
=
0x9f
;
*
(
ppp_area
[
1
][
2
]
+
p_outpic
->
p
[
2
].
i_pitch
*
i_index
/
SCOPE_WIDTH
+
p_outpic
->
p
[
2
].
i_lines
*
i_right_value
/
512
*
p_outpic
->
p
[
2
].
i_pitch
)
=
0xdd
;
}
}
/* Display the picture - FIXME: find a better date :-) */
vout_DatePicture
(
p_filter
->
p_sys
->
p_vout
,
p_outpic
,
p_in_buf
->
start_date
+
i_image
*
20000
);
vout_DisplayPicture
(
p_filter
->
p_sys
->
p_vout
,
p_outpic
);
p_buffer
+=
SCOPE_WIDTH
*
8
;
}
}
/*****************************************************************************
* Close: close the plugin
*****************************************************************************/
static
void
Close
(
vlc_object_t
*
p_this
)
{
aout_filter_t
*
p_filter
=
(
aout_filter_t
*
)
p_this
;
/* Kill video output */
vout_Destroy
(
p_filter
->
p_sys
->
p_vout
);
free
(
p_filter
->
p_sys
);
}
modules/visualization/xosd
/xosd
.c
→
modules/visualization/xosd.c
View file @
6265a3ae
...
...
@@ -2,7 +2,7 @@
* xosd.c : X On Screen Display interface
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id
: xosd.c,v 1.12 2004/01/25 20:40:59 gbazin Exp
$
* $Id$
*
* Authors: Loc Minier <lool@videolan.org>
*
...
...
modules/visualization/xosd/Modules.am
deleted
100644 → 0
View file @
1778b48e
SOURCES_xosd = xosd.c
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