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
cf1498fb
Commit
cf1498fb
authored
Aug 25, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove write-only block_t.i_rate
parent
b01ceae1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1 addition
and
12 deletions
+1
-12
include/vlc_block.h
include/vlc_block.h
+0
-3
modules/audio_filter/converter/format.c
modules/audio_filter/converter/format.c
+0
-1
modules/demux/mkv/mkv.cpp
modules/demux/mkv/mkv.cpp
+0
-1
src/input/decoder.c
src/input/decoder.c
+1
-2
src/input/es_out.c
src/input/es_out.c
+0
-2
src/input/es_out_timeshift.c
src/input/es_out_timeshift.c
+0
-1
src/misc/block.c
src/misc/block.c
+0
-2
No files found.
include/vlc_block.h
View file @
cf1498fb
...
...
@@ -40,7 +40,6 @@
* - i_dts/i_pts could be VLC_TS_INVALID, it means no pts/dts
* - i_length: length in microseond of the packet, can be null except in the
* sout where it is mandatory.
* - i_rate 0 or a valid input rate, look at vlc_input.h
*
* - i_buffer number of valid data pointed by p_buffer
* you can freely decrease it but never increase it yourself
...
...
@@ -111,7 +110,6 @@ struct block_t
mtime_t
i_length
;
unsigned
i_nb_samples
;
/* Used for audio */
int
i_rate
;
size_t
i_buffer
;
uint8_t
*
p_buffer
;
...
...
@@ -153,7 +151,6 @@ static inline block_t *block_Duplicate( block_t *p_block )
p_dup
->
i_pts
=
p_block
->
i_pts
;
p_dup
->
i_flags
=
p_block
->
i_flags
;
p_dup
->
i_length
=
p_block
->
i_length
;
p_dup
->
i_rate
=
p_block
->
i_rate
;
p_dup
->
i_nb_samples
=
p_block
->
i_nb_samples
;
memcpy
(
p_dup
->
p_buffer
,
p_block
->
p_buffer
,
p_block
->
i_buffer
);
...
...
modules/audio_filter/converter/format.c
View file @
cf1498fb
...
...
@@ -184,7 +184,6 @@ static block_t *Filter(filter_t *filter, block_t *block)
out
->
i_dts
=
block
->
i_dts
;
out
->
i_pts
=
block
->
i_pts
;
out
->
i_length
=
block
->
i_length
;
out
->
i_rate
=
block
->
i_rate
;
sys
->
indirects
[
i
](
out
,
block
);
...
...
modules/demux/mkv/mkv.cpp
View file @
cf1498fb
...
...
@@ -458,7 +458,6 @@ static block_t *MemToBlock( uint8_t *p_mem, size_t i_mem, size_t offset)
if
(
likely
(
p_block
!=
NULL
)
)
{
memcpy
(
p_block
->
p_buffer
+
offset
,
p_mem
,
i_mem
);
//p_block->i_rate = p_input->stream.control.i_rate;
}
return
p_block
;
}
...
...
src/input/decoder.c
View file @
cf1498fb
...
...
@@ -1704,8 +1704,7 @@ static void DecoderPlaySout( decoder_t *p_dec, block_t *p_sout_block,
p_sout_block
->
p_next
=
NULL
;
DecoderFixTs
(
p_dec
,
&
p_sout_block
->
i_dts
,
&
p_sout_block
->
i_pts
,
&
p_sout_block
->
i_length
,
&
p_sout_block
->
i_rate
,
INT64_MAX
,
b_telx
);
&
p_sout_block
->
i_length
,
NULL
,
INT64_MAX
,
b_telx
);
vlc_mutex_unlock
(
&
p_owner
->
lock
);
...
...
src/input/es_out.c
View file @
cf1498fb
...
...
@@ -1960,8 +1960,6 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
p_block
->
i_flags
|=
BLOCK_FLAG_PREROLL
;
}
p_block
->
i_rate
=
0
;
if
(
!
es
->
p_dec
)
{
block_Release
(
p_block
);
...
...
src/input/es_out_timeshift.c
View file @
cf1498fb
...
...
@@ -1190,7 +1190,6 @@ static void TsStoragePopCmd( ts_storage_t *p_storage, ts_cmd_t *p_cmd, bool b_fl
p_block
->
i_pts
=
block
.
i_pts
;
p_block
->
i_flags
=
block
.
i_flags
;
p_block
->
i_length
=
block
.
i_length
;
p_block
->
i_rate
=
block
.
i_rate
;
p_block
->
i_nb_samples
=
block
.
i_nb_samples
;
p_block
->
i_buffer
=
fread
(
p_block
->
p_buffer
,
1
,
block
.
i_buffer
,
p_storage
->
p_filer
);
}
...
...
src/misc/block.c
View file @
cf1498fb
...
...
@@ -64,7 +64,6 @@ void block_Init( block_t *restrict b, void *buf, size_t size )
b
->
i_pts
=
b
->
i_dts
=
VLC_TS_INVALID
;
b
->
i_length
=
0
;
b
->
i_rate
=
0
;
b
->
i_nb_samples
=
0
;
b
->
p_buffer
=
buf
;
b
->
i_buffer
=
size
;
...
...
@@ -85,7 +84,6 @@ static void BlockMetaCopy( block_t *restrict out, const block_t *in )
out
->
i_pts
=
in
->
i_pts
;
out
->
i_flags
=
in
->
i_flags
;
out
->
i_length
=
in
->
i_length
;
out
->
i_rate
=
in
->
i_rate
;
out
->
i_nb_samples
=
in
->
i_nb_samples
;
}
...
...
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