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
c5d8d051
Commit
c5d8d051
authored
May 21, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MKV: remove unused variables
parent
56fbad8e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
18 deletions
+16
-18
modules/demux/mkv/chapter_command.cpp
modules/demux/mkv/chapter_command.cpp
+2
-2
modules/demux/mkv/chapter_command.hpp
modules/demux/mkv/chapter_command.hpp
+1
-1
modules/demux/mkv/demux.cpp
modules/demux/mkv/demux.cpp
+5
-8
modules/demux/mkv/matroska_segment.cpp
modules/demux/mkv/matroska_segment.cpp
+0
-4
modules/demux/mkv/matroska_segment_parse.cpp
modules/demux/mkv/matroska_segment_parse.cpp
+1
-1
modules/demux/mkv/mkv.hpp
modules/demux/mkv/mkv.hpp
+1
-1
modules/demux/mkv/stream_io_callback.cpp
modules/demux/mkv/stream_io_callback.cpp
+5
-0
modules/demux/mkv/stream_io_callback.hpp
modules/demux/mkv/stream_io_callback.hpp
+1
-1
No files found.
modules/demux/mkv/chapter_command.cpp
View file @
c5d8d051
...
@@ -587,12 +587,12 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si
...
@@ -587,12 +587,12 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si
bool
dvd_command_interpretor_c
::
MatchIsDomain
(
const
chapter_codec_cmds_c
&
data
,
const
void
*
p_cookie
,
size_t
i_cookie_size
)
bool
dvd_command_interpretor_c
::
MatchIsDomain
(
const
chapter_codec_cmds_c
&
data
,
const
void
*
,
size_t
)
{
{
return
(
data
.
p_private_data
!=
NULL
&&
data
.
p_private_data
->
GetBuffer
()[
0
]
==
MATROSKA_DVD_LEVEL_SS
);
return
(
data
.
p_private_data
!=
NULL
&&
data
.
p_private_data
->
GetBuffer
()[
0
]
==
MATROSKA_DVD_LEVEL_SS
);
}
}
bool
dvd_command_interpretor_c
::
MatchIsVMG
(
const
chapter_codec_cmds_c
&
data
,
const
void
*
p_cookie
,
size_t
i_cookie_size
)
bool
dvd_command_interpretor_c
::
MatchIsVMG
(
const
chapter_codec_cmds_c
&
data
,
const
void
*
,
size_t
)
{
{
if
(
data
.
p_private_data
==
NULL
||
data
.
p_private_data
->
GetSize
()
<
2
)
if
(
data
.
p_private_data
==
NULL
||
data
.
p_private_data
->
GetSize
()
<
2
)
return
false
;
return
false
;
...
...
modules/demux/mkv/chapter_command.hpp
View file @
c5d8d051
...
@@ -79,7 +79,7 @@ public:
...
@@ -79,7 +79,7 @@ public:
/// \return wether the codec has seeked in the files or not
/// \return wether the codec has seeked in the files or not
virtual
bool
Enter
()
{
return
false
;
}
virtual
bool
Enter
()
{
return
false
;
}
virtual
bool
Leave
()
{
return
false
;
}
virtual
bool
Leave
()
{
return
false
;
}
virtual
std
::
string
GetCodecName
(
bool
f_for_title
=
false
)
const
{
return
""
;
}
virtual
std
::
string
GetCodecName
(
bool
)
const
{
return
""
;
}
virtual
int16
GetTitleNumber
()
{
return
-
1
;
}
virtual
int16
GetTitleNumber
()
{
return
-
1
;
}
KaxChapterProcessPrivate
*
p_private_data
;
KaxChapterProcessPrivate
*
p_private_data
;
...
...
modules/demux/mkv/demux.cpp
View file @
c5d8d051
...
@@ -87,6 +87,7 @@ void event_thread_t::ResetPci()
...
@@ -87,6 +87,7 @@ void event_thread_t::ResetPci()
int
event_thread_t
::
EventMouse
(
vlc_object_t
*
p_this
,
char
const
*
psz_var
,
int
event_thread_t
::
EventMouse
(
vlc_object_t
*
p_this
,
char
const
*
psz_var
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
{
{
VLC_UNUSED
(
oldval
);
VLC_UNUSED
(
newval
);
event_thread_t
*
p_ev
=
(
event_thread_t
*
)
p_data
;
event_thread_t
*
p_ev
=
(
event_thread_t
*
)
p_data
;
vlc_mutex_lock
(
&
p_ev
->
lock
);
vlc_mutex_lock
(
&
p_ev
->
lock
);
if
(
psz_var
[
6
]
==
'c'
)
if
(
psz_var
[
6
]
==
'c'
)
...
@@ -118,6 +119,7 @@ int event_thread_t::EventKey( vlc_object_t *p_this, char const *,
...
@@ -118,6 +119,7 @@ int event_thread_t::EventKey( vlc_object_t *p_this, char const *,
int
event_thread_t
::
EventInput
(
vlc_object_t
*
p_this
,
char
const
*
,
int
event_thread_t
::
EventInput
(
vlc_object_t
*
p_this
,
char
const
*
,
vlc_value_t
,
vlc_value_t
newval
,
void
*
p_data
)
vlc_value_t
,
vlc_value_t
newval
,
void
*
p_data
)
{
{
VLC_UNUSED
(
p_this
);
event_thread_t
*
p_ev
=
(
event_thread_t
*
)
p_data
;
event_thread_t
*
p_ev
=
(
event_thread_t
*
)
p_data
;
vlc_mutex_lock
(
&
p_ev
->
lock
);
vlc_mutex_lock
(
&
p_ev
->
lock
);
if
(
newval
.
i_int
==
INPUT_EVENT_VOUT
)
if
(
newval
.
i_int
==
INPUT_EVENT_VOUT
)
...
@@ -130,7 +132,6 @@ int event_thread_t::EventInput( vlc_object_t *p_this, char const *,
...
@@ -130,7 +132,6 @@ int event_thread_t::EventInput( vlc_object_t *p_this, char const *,
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
void
event_thread_t
::
EventThread
()
void
event_thread_t
::
EventThread
()
{
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
...
@@ -160,8 +161,6 @@ void event_thread_t::EventThread()
...
@@ -160,8 +161,6 @@ void event_thread_t::EventThread()
break
;
break
;
}
}
bool
b_activated
=
false
;
/* KEY part */
/* KEY part */
if
(
i_key_action
)
if
(
i_key_action
)
{
{
...
@@ -266,8 +265,6 @@ void event_thread_t::EventThread()
...
@@ -266,8 +265,6 @@ void event_thread_t::EventThread()
}
}
break
;
break
;
case
ACTIONID_NAV_ACTIVATE
:
case
ACTIONID_NAV_ACTIVATE
:
b_activated
=
true
;
if
(
i_curr_button
>
0
&&
i_curr_button
<=
pci
->
hli
.
hl_gi
.
btn_ns
)
if
(
i_curr_button
>
0
&&
i_curr_button
<=
pci
->
hli
.
hl_gi
.
btn_ns
)
{
{
btni_t
button_ptr
=
pci
->
hli
.
btnit
[
i_curr_button
-
1
];
btni_t
button_ptr
=
pci
->
hli
.
btnit
[
i_curr_button
-
1
];
...
@@ -304,7 +301,6 @@ void event_thread_t::EventThread()
...
@@ -304,7 +301,6 @@ void event_thread_t::EventThread()
msg_Dbg
(
p_demux
,
"Handle Mouse Event: Mouse clicked x(%d)*y(%d)"
,
x
,
y
);
msg_Dbg
(
p_demux
,
"Handle Mouse Event: Mouse clicked x(%d)*y(%d)"
,
x
,
y
);
b_activated
=
true
;
// get current button
// get current button
best
=
0
;
best
=
0
;
dist
=
0x08000000
;
/* >> than (720*720)+(567*567); */
dist
=
0x08000000
;
/* >> than (720*720)+(567*567); */
...
@@ -435,6 +431,7 @@ void event_thread_t::EventThread()
...
@@ -435,6 +431,7 @@ void event_thread_t::EventThread()
vlc_restorecancel
(
canc
);
vlc_restorecancel
(
canc
);
}
}
void
*
event_thread_t
::
EventThread
(
void
*
data
)
void
*
event_thread_t
::
EventThread
(
void
*
data
)
{
{
static_cast
<
event_thread_t
*>
(
data
)
->
EventThread
();
static_cast
<
event_thread_t
*>
(
data
)
->
EventThread
();
...
@@ -642,7 +639,7 @@ void demux_sys_t::PreloadLinked( matroska_segment_c *p_segment )
...
@@ -642,7 +639,7 @@ void demux_sys_t::PreloadLinked( matroska_segment_c *p_segment )
virtual_segment_c
*
p_seg
;
virtual_segment_c
*
p_seg
;
p_current_segment
=
VirtualFromSegments
(
p_segment
);
p_current_segment
=
VirtualFromSegments
(
p_segment
);
used_segments
.
push_back
(
p_current_segment
);
used_segments
.
push_back
(
p_current_segment
);
// create all the other virtual segments of the family
// create all the other virtual segments of the family
...
@@ -771,7 +768,7 @@ void demux_sys_t::JumpTo( virtual_segment_c & vsegment, chapter_item_c * p_chapt
...
@@ -771,7 +768,7 @@ void demux_sys_t::JumpTo( virtual_segment_c & vsegment, chapter_item_c * p_chapt
vsegment
.
Seek
(
demuxer
,
p_chapter
->
i_user_start_time
,
-
1
,
p_chapter
,
-
1
);
vsegment
.
Seek
(
demuxer
,
p_chapter
->
i_user_start_time
,
-
1
,
p_chapter
,
-
1
);
}
}
}
}
}
}
matroska_segment_c
*
demux_sys_t
::
FindSegment
(
const
EbmlBinary
&
uid
)
const
matroska_segment_c
*
demux_sys_t
::
FindSegment
(
const
EbmlBinary
&
uid
)
const
...
...
modules/demux/mkv/matroska_segment.cpp
View file @
c5d8d051
...
@@ -1125,12 +1125,8 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
...
@@ -1125,12 +1125,8 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
p_fmt
->
audio
.
i_rate
=
8000
;
p_fmt
->
audio
.
i_rate
=
8000
;
p_fmt
->
audio
.
i_blockalign
=
0x14
;
p_fmt
->
audio
.
i_blockalign
=
0x14
;
}
}
/* disabled due to the potential "S_KATE" namespace issue */
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"S_KATE"
)
)
else
if
(
!
strcmp
(
p_tk
->
psz_codec
,
"S_KATE"
)
)
{
{
int
i
,
i_offset
=
1
,
i_extra
,
num_headers
,
size_so_far
;
uint8_t
*
p_extra
;
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_KATE
;
p_tk
->
fmt
.
i_codec
=
VLC_CODEC_KATE
;
p_tk
->
fmt
.
subs
.
psz_encoding
=
strdup
(
"UTF-8"
);
p_tk
->
fmt
.
subs
.
psz_encoding
=
strdup
(
"UTF-8"
);
...
...
modules/demux/mkv/matroska_segment_parse.cpp
View file @
c5d8d051
...
@@ -549,7 +549,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
...
@@ -549,7 +549,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
i_display_unit
=
uint8
(
vdmode
);
i_display_unit
=
uint8
(
vdmode
);
msg_Dbg
(
&
sys
.
demuxer
,
"| | | | + Track Video Display Unit=%s"
,
msg_Dbg
(
&
sys
.
demuxer
,
"| | | | + Track Video Display Unit=%s"
,
uint8
(
vdmode
)
==
0
?
"pixels"
:
(
uint8
(
vdmode
)
==
1
?
"centimeters"
:
"inches"
)
);
i_display_unit
==
0
?
"pixels"
:
(
i_display_unit
==
1
?
"centimeters"
:
"inches"
)
);
}
}
else
if
(
MKV_IS_ID
(
l
,
KaxVideoAspectRatio
)
)
// UNUSED
else
if
(
MKV_IS_ID
(
l
,
KaxVideoAspectRatio
)
)
// UNUSED
{
{
...
...
modules/demux/mkv/mkv.hpp
View file @
c5d8d051
...
@@ -179,7 +179,7 @@ typedef struct
...
@@ -179,7 +179,7 @@ typedef struct
bool
b_enabled
;
bool
b_enabled
;
unsigned
int
i_number
;
unsigned
int
i_number
;
int
i_extra_data
;
unsigned
int
i_extra_data
;
uint8_t
*
p_extra_data
;
uint8_t
*
p_extra_data
;
char
*
psz_codec
;
char
*
psz_codec
;
...
...
modules/demux/mkv/stream_io_callback.cpp
View file @
c5d8d051
...
@@ -82,3 +82,8 @@ uint64 vlc_stream_io_callback::getFilePointer( void )
...
@@ -82,3 +82,8 @@ uint64 vlc_stream_io_callback::getFilePointer( void )
return
stream_Tell
(
s
);
return
stream_Tell
(
s
);
}
}
size_t
vlc_stream_io_callback
::
write
(
const
void
*
,
size_t
)
{
return
0
;
}
modules/demux/mkv/stream_io_callback.hpp
View file @
c5d8d051
...
@@ -44,7 +44,7 @@ class vlc_stream_io_callback: public IOCallback
...
@@ -44,7 +44,7 @@ class vlc_stream_io_callback: public IOCallback
virtual
uint32
read
(
void
*
p_buffer
,
size_t
i_size
);
virtual
uint32
read
(
void
*
p_buffer
,
size_t
i_size
);
virtual
void
setFilePointer
(
int64_t
i_offset
,
seek_mode
mode
=
seek_beginning
);
virtual
void
setFilePointer
(
int64_t
i_offset
,
seek_mode
mode
=
seek_beginning
);
virtual
size_t
write
(
const
void
*
p_buffer
,
size_t
i_size
)
{
return
0
;
}
virtual
size_t
write
(
const
void
*
p_buffer
,
size_t
i_size
)
;
virtual
uint64
getFilePointer
(
void
);
virtual
uint64
getFilePointer
(
void
);
virtual
void
close
(
void
)
{
return
;
}
virtual
void
close
(
void
)
{
return
;
}
};
};
...
...
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