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
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
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
Steve Lhomme
VLC
Commits
52707967
Commit
52707967
authored
Dec 13, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace block_New() with block_Alloc()
parent
0fc6e8cf
Changes
92
Hide whitespace changes
Inline
Side-by-side
Showing
92 changed files
with
143 additions
and
148 deletions
+143
-148
include/vlc_block.h
include/vlc_block.h
+0
-2
include/vlc_filter.h
include/vlc_filter.h
+1
-1
modules/access/bd/bd.c
modules/access/bd/bd.c
+1
-1
modules/access/bluray.c
modules/access/bluray.c
+1
-1
modules/access/cdda.c
modules/access/cdda.c
+2
-2
modules/access/dc1394.c
modules/access/dc1394.c
+1
-2
modules/access/decklink.cpp
modules/access/decklink.cpp
+2
-2
modules/access/dshow/dshow.cpp
modules/access/dshow/dshow.cpp
+2
-2
modules/access/dtv/bdagraph.cpp
modules/access/dtv/bdagraph.cpp
+1
-1
modules/access/dv.c
modules/access/dv.c
+1
-1
modules/access/dvb/access.c
modules/access/dvb/access.c
+1
-1
modules/access/dvdnav.c
modules/access/dvdnav.c
+1
-1
modules/access/dvdread.c
modules/access/dvdread.c
+1
-1
modules/access/eyetv.m
modules/access/eyetv.m
+1
-1
modules/access/imem.c
modules/access/imem.c
+2
-2
modules/access/jack.c
modules/access/jack.c
+1
-1
modules/access/linsys/linsys_hdsdi.c
modules/access/linsys/linsys_hdsdi.c
+2
-2
modules/access/linsys/linsys_sdi.c
modules/access/linsys/linsys_sdi.c
+3
-4
modules/access/mms/mmsh.c
modules/access/mms/mmsh.c
+2
-2
modules/access/mms/mmstu.c
modules/access/mms/mmstu.c
+2
-2
modules/access/oss.c
modules/access/oss.c
+1
-1
modules/access/qtcapture.m
modules/access/qtcapture.m
+1
-1
modules/access/qtsound.m
modules/access/qtsound.m
+1
-1
modules/access/rtsp/access.c
modules/access/rtsp/access.c
+2
-2
modules/access/screen/mac.c
modules/access/screen/mac.c
+1
-1
modules/access/sftp.c
modules/access/sftp.c
+1
-1
modules/access/udp.c
modules/access/udp.c
+1
-1
modules/access/vcd/vcd.c
modules/access/vcd/vcd.c
+1
-1
modules/access/vcdx/access.c
modules/access/vcdx/access.c
+1
-1
modules/codec/a52.c
modules/codec/a52.c
+1
-1
modules/codec/avcodec/encoder.c
modules/codec/avcodec/encoder.c
+3
-3
modules/codec/dirac.c
modules/codec/dirac.c
+3
-3
modules/codec/dmo/dmo.c
modules/codec/dmo/dmo.c
+3
-3
modules/codec/dts.c
modules/codec/dts.c
+1
-1
modules/codec/dvbsub.c
modules/codec/dvbsub.c
+2
-2
modules/codec/fdkaac.c
modules/codec/fdkaac.c
+1
-1
modules/codec/flac.c
modules/codec/flac.c
+2
-2
modules/codec/libmpeg2.c
modules/codec/libmpeg2.c
+1
-1
modules/codec/lpcm.c
modules/codec/lpcm.c
+1
-1
modules/codec/mpeg_audio.c
modules/codec/mpeg_audio.c
+1
-1
modules/codec/omxil/omxil.c
modules/codec/omxil/omxil.c
+1
-1
modules/codec/schroedinger.c
modules/codec/schroedinger.c
+3
-3
modules/codec/shine/shine_mod.c
modules/codec/shine/shine_mod.c
+2
-2
modules/codec/speex.c
modules/codec/speex.c
+2
-2
modules/codec/subsusf.c
modules/codec/subsusf.c
+1
-1
modules/codec/t140.c
modules/codec/t140.c
+1
-1
modules/codec/theora.c
modules/codec/theora.c
+1
-1
modules/codec/twolame.c
modules/codec/twolame.c
+1
-1
modules/codec/vorbis.c
modules/codec/vorbis.c
+1
-1
modules/codec/x264.c
modules/codec/x264.c
+1
-1
modules/demux/avformat/demux.c
modules/demux/avformat/demux.c
+1
-1
modules/demux/avformat/mux.c
modules/demux/avformat/mux.c
+1
-1
modules/demux/image.c
modules/demux/image.c
+1
-1
modules/demux/live555.cpp
modules/demux/live555.cpp
+6
-6
modules/demux/mkv/util.cpp
modules/demux/mkv/util.cpp
+3
-3
modules/demux/mod.c
modules/demux/mod.c
+1
-1
modules/demux/mpc.c
modules/demux/mpc.c
+1
-2
modules/demux/ogg.c
modules/demux/ogg.c
+1
-1
modules/demux/rawdv.h
modules/demux/rawdv.h
+1
-1
modules/demux/real.c
modules/demux/real.c
+6
-6
modules/demux/sid.cpp
modules/demux/sid.cpp
+1
-1
modules/demux/smf.c
modules/demux/smf.c
+2
-2
modules/demux/subtitle.c
modules/demux/subtitle.c
+1
-1
modules/demux/ty.c
modules/demux/ty.c
+1
-1
modules/demux/vobsub.c
modules/demux/vobsub.c
+2
-2
modules/demux/voc.c
modules/demux/voc.c
+1
-1
modules/misc/rtsp.c
modules/misc/rtsp.c
+1
-1
modules/misc/stats/encoder.c
modules/misc/stats/encoder.c
+1
-1
modules/mux/asf.c
modules/mux/asf.c
+5
-5
modules/mux/avi.c
modules/mux/avi.c
+2
-2
modules/mux/dummy.c
modules/mux/dummy.c
+1
-1
modules/mux/mp4.c
modules/mux/mp4.c
+2
-2
modules/mux/mpeg/ps.c
modules/mux/mpeg/ps.c
+4
-4
modules/mux/mpeg/ts.c
modules/mux/mpeg/ts.c
+3
-3
modules/mux/mpjpeg.c
modules/mux/mpjpeg.c
+1
-1
modules/mux/ogg.c
modules/mux/ogg.c
+1
-1
modules/mux/wav.c
modules/mux/wav.c
+1
-1
modules/packetizer/dirac.c
modules/packetizer/dirac.c
+3
-3
modules/packetizer/flac.c
modules/packetizer/flac.c
+1
-1
modules/packetizer/h264.c
modules/packetizer/h264.c
+2
-2
modules/packetizer/mlp.c
modules/packetizer/mlp.c
+1
-1
modules/packetizer/mpeg4audio.c
modules/packetizer/mpeg4audio.c
+1
-1
modules/packetizer/mpegvideo.c
modules/packetizer/mpegvideo.c
+1
-1
modules/packetizer/packetizer_helper.h
modules/packetizer/packetizer_helper.h
+1
-1
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+1
-1
modules/stream_out/rtpfmt.c
modules/stream_out/rtpfmt.c
+1
-1
modules/stream_out/switcher.c
modules/stream_out/switcher.c
+2
-2
modules/stream_out/transcode/audio.c
modules/stream_out/transcode/audio.c
+1
-1
modules/stream_out/vod.c
modules/stream_out/vod.c
+1
-1
modules/visualization/goom.c
modules/visualization/goom.c
+1
-1
src/input/stream.c
src/input/stream.c
+2
-2
src/misc/image.c
src/misc/image.c
+1
-1
No files found.
include/vlc_block.h
View file @
52707967
...
...
@@ -139,8 +139,6 @@ VLC_API void block_Init( block_t *, void *, size_t );
VLC_API
block_t
*
block_Alloc
(
size_t
)
VLC_USED
VLC_MALLOC
;
VLC_API
block_t
*
block_Realloc
(
block_t
*
,
ssize_t
i_pre
,
size_t
i_body
)
VLC_USED
;
#define block_New( dummy, size ) block_Alloc(size)
VLC_USED
static
inline
block_t
*
block_Duplicate
(
block_t
*
p_block
)
{
...
...
include/vlc_filter.h
View file @
52707967
...
...
@@ -209,7 +209,7 @@ static inline void filter_DeleteSubpicture( filter_t *p_filter, subpicture_t *p_
p_filter
->
pf_sub_buffer_del
(
p_filter
,
p_subpicture
);
}
#define filter_NewAudioBuffer
block_New
#define filter_NewAudioBuffer
(f,s) ((f), block_Alloc(s))
/**
* This function gives all input attachments at once.
...
...
modules/access/bd/bd.c
View file @
52707967
...
...
@@ -409,7 +409,7 @@ static int Demux( demux_t *p_demux )
/* XXX
* we ensure that the TS packet start at the begining of the buffer,
* it ensure proper TS parsing */
block_t
*
p_block
=
block_
New
(
p_demux
,
i_packets
*
BD_TS_PACKET_SIZE
+
BD_TS_PACKET_HEADER
);
block_t
*
p_block
=
block_
Alloc
(
i_packets
*
BD_TS_PACKET_SIZE
+
BD_TS_PACKET_HEADER
);
if
(
!
p_block
)
return
-
1
;
...
...
modules/access/bluray.c
View file @
52707967
...
...
@@ -1213,7 +1213,7 @@ static int blurayDemux(demux_t *p_demux)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
block_t
*
p_block
=
block_
New
(
p_demux
,
NB_TS_PACKETS
*
(
int64_t
)
BD_TS_PACKET_SIZE
);
block_t
*
p_block
=
block_
Alloc
(
NB_TS_PACKETS
*
(
int64_t
)
BD_TS_PACKET_SIZE
);
if
(
!
p_block
)
{
return
-
1
;
}
...
...
modules/access/cdda.c
View file @
52707967
...
...
@@ -262,7 +262,7 @@ static block_t *Block( access_t *p_access )
if
(
!
p_sys
->
b_header
)
{
/* Return only the header */
p_block
=
block_
New
(
p_access
,
sizeof
(
WAVEHEADER
)
);
p_block
=
block_
Alloc
(
sizeof
(
WAVEHEADER
)
);
memcpy
(
p_block
->
p_buffer
,
&
p_sys
->
waveheader
,
sizeof
(
WAVEHEADER
)
);
p_sys
->
b_header
=
true
;
return
p_block
;
...
...
@@ -279,7 +279,7 @@ static block_t *Block( access_t *p_access )
i_blocks
=
p_sys
->
i_last_sector
-
p_sys
->
i_sector
;
/* Do the actual reading */
if
(
!
(
p_block
=
block_
New
(
p_access
,
i_blocks
*
CDDA_DATA_SIZE
)
)
)
if
(
!
(
p_block
=
block_
Alloc
(
i_blocks
*
CDDA_DATA_SIZE
)
)
)
{
msg_Err
(
p_access
,
"cannot get a new block of size: %i"
,
i_blocks
*
CDDA_DATA_SIZE
);
...
...
modules/access/dc1394.c
View file @
52707967
...
...
@@ -443,8 +443,7 @@ static block_t *GrabVideo( demux_t *p_demux )
return
NULL
;
}
p_block
=
block_New
(
p_demux
,
p_sys
->
frame
->
size
[
0
]
*
p_sys
->
frame
->
size
[
1
]
*
2
);
p_block
=
block_Alloc
(
p_sys
->
frame
->
size
[
0
]
*
p_sys
->
frame
->
size
[
1
]
*
2
);
if
(
!
p_block
)
{
msg_Err
(
p_demux
,
"Can not get block"
);
...
...
modules/access/decklink.cpp
View file @
52707967
...
...
@@ -254,7 +254,7 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame
const
int
stride
=
videoFrame
->
GetRowBytes
();
int
bpp
=
sys
->
tenbits
?
4
:
2
;
block_t
*
video_frame
=
block_
New
(
demux_
,
width
*
height
*
bpp
);
block_t
*
video_frame
=
block_
Alloc
(
width
*
height
*
bpp
);
if
(
!
video_frame
)
return
S_OK
;
...
...
@@ -399,7 +399,7 @@ HRESULT DeckLinkCaptureDelegate::VideoInputFrameArrived(IDeckLinkVideoInputFrame
if
(
audioFrame
)
{
const
int
bytes
=
audioFrame
->
GetSampleFrameCount
()
*
sizeof
(
int16_t
)
*
sys
->
channels
;
block_t
*
audio_frame
=
block_
New
(
demux_
,
bytes
);
block_t
*
audio_frame
=
block_
Alloc
(
bytes
);
if
(
!
audio_frame
)
return
S_OK
;
...
...
modules/access/dshow/dshow.cpp
View file @
52707967
...
...
@@ -1817,7 +1817,7 @@ static block_t *ReadCompressed( access_t *p_access )
uint8_t
*
p_data
;
int
i_data_size
=
sample
.
p_sample
->
GetActualDataLength
();
if
(
!
i_data_size
||
!
(
p_block
=
block_
New
(
p_access
,
i_data_size
))
)
if
(
!
i_data_size
||
!
(
p_block
=
block_
Alloc
(
i_data_size
))
)
{
sample
.
p_sample
->
Release
();
continue
;
...
...
@@ -1912,7 +1912,7 @@ static int Demux( demux_t *p_demux )
i_stream, i_data_size, i_pts );
#endif
p_block
=
block_
New
(
p_demux
,
i_data_size
);
p_block
=
block_
Alloc
(
i_data_size
);
memcpy
(
p_block
->
p_buffer
,
p_data
,
i_data_size
);
p_block
->
i_pts
=
p_block
->
i_dts
=
i_pts
;
sample
.
p_sample
->
Release
();
...
...
modules/access/dtv/bdagraph.cpp
View file @
52707967
...
...
@@ -2822,7 +2822,7 @@ STDMETHODIMP BDAGraph::SampleCB( double /*date*/, IMediaSample *p_sample )
if
(
i_sample_size
>
0
&&
p_sample_data
)
{
block_t
*
p_block
=
block_
New
(
p_access
,
i_sample_size
);
block_t
*
p_block
=
block_
Alloc
(
i_sample_size
);
if
(
p_block
)
{
...
...
modules/access/dv.c
View file @
52707967
...
...
@@ -402,7 +402,7 @@ Raw1394Handler(raw1394handle_t handle, unsigned char *data,
block_ChainAppend
(
&
p_sys
->
p_frame
,
p_sys
->
p_ev
->
p_frame
);
}
/* reset list */
p_sys
->
p_ev
->
p_frame
=
block_
New
(
p_access
,
144000
);
p_sys
->
p_ev
->
p_frame
=
block_
Alloc
(
144000
);
p_sys
->
p_ev
->
pp_last
=
&
p_sys
->
p_frame
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
}
...
...
modules/access/dvb/access.c
View file @
52707967
...
...
@@ -338,7 +338,7 @@ static block_t *BlockScan( access_t *p_access )
if
(
ufds
[
0
].
revents
)
{
const
int
i_read_once
=
1
;
block_t
*
p_block
=
block_
New
(
p_access
,
i_read_once
*
TS_PACKET_SIZE
);
block_t
*
p_block
=
block_
Alloc
(
i_read_once
*
TS_PACKET_SIZE
);
if
(
(
i_ret
=
read
(
p_sys
->
i_handle
,
p_block
->
p_buffer
,
i_read_once
*
TS_PACKET_SIZE
)
)
<=
0
)
...
...
modules/access/dvdnav.c
View file @
52707967
...
...
@@ -1162,7 +1162,7 @@ static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len )
}
/* Create a block */
block_t
*
p_pkt
=
block_
New
(
p_demux
,
i_size
);
block_t
*
p_pkt
=
block_
Alloc
(
i_size
);
memcpy
(
p_pkt
->
p_buffer
,
p
,
i_size
);
/* Parse it and send it */
...
...
modules/access/dvdread.c
View file @
52707967
...
...
@@ -565,7 +565,7 @@ static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len )
}
/* Create a block */
block_t
*
p_pkt
=
block_
New
(
p_demux
,
i_size
);
block_t
*
p_pkt
=
block_
Alloc
(
i_size
);
memcpy
(
p_pkt
->
p_buffer
,
p
,
i_size
);
/* Parse it and send it */
...
...
modules/access/eyetv.m
View file @
52707967
...
...
@@ -259,7 +259,7 @@ static block_t *BlockRead(access_t *p_access)
return
NULL
;
/* Read data */
p_block
=
block_
New
(
p_access
,
MTU
);
p_block
=
block_
Alloc
(
MTU
);
len
=
net_Read
(
p_access
,
p_sys
->
eyetvSock
,
NULL
,
p_block
->
p_buffer
,
MTU
,
false
);
...
...
modules/access/imem.c
View file @
52707967
...
...
@@ -384,7 +384,7 @@ static block_t *Block(access_t *access)
block_t
*
block
=
NULL
;
if
(
buffer_size
>
0
)
{
block
=
block_
New
(
access
,
buffer_size
);
block
=
block_
Alloc
(
buffer_size
);
if
(
block
)
memcpy
(
block
->
p_buffer
,
buffer
,
buffer_size
);
}
...
...
@@ -584,7 +584,7 @@ static int Demux(demux_t *demux)
dts
=
pts
;
if
(
buffer_size
>
0
)
{
block_t
*
block
=
block_
New
(
demux
,
buffer_size
);
block_t
*
block
=
block_
Alloc
(
buffer_size
);
if
(
block
)
{
block
->
i_dts
=
dts
>=
0
?
(
1
+
dts
)
:
VLC_TS_INVALID
;
block
->
i_pts
=
pts
>=
0
?
(
1
+
pts
)
:
VLC_TS_INVALID
;
...
...
modules/access/jack.c
View file @
52707967
...
...
@@ -463,7 +463,7 @@ static block_t *GrabJack( demux_t *p_demux )
}
else
{
p_block
=
block_
New
(
p_demux
,
i_read
);
p_block
=
block_
Alloc
(
i_read
);
}
if
(
!
p_block
)
{
...
...
modules/access/linsys/linsys_hdsdi.c
View file @
52707967
...
...
@@ -539,7 +539,7 @@ static int InitAudio( demux_t *p_demux )
static
int
HandleVideo
(
demux_t
*
p_demux
,
const
uint8_t
*
p_buffer
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
block_t
*
p_current_picture
=
block_
New
(
p_demux
,
p_sys
->
i_vblock_size
);
block_t
*
p_current_picture
=
block_
Alloc
(
p_sys
->
i_vblock_size
);
if
(
unlikely
(
!
p_current_picture
)
)
return
VLC_ENOMEM
;
uint8_t
*
p_y
=
p_current_picture
->
p_buffer
;
...
...
@@ -609,7 +609,7 @@ static int HandleAudio( demux_t *p_demux, const uint8_t *p_buffer )
hdsdi_audio_t
*
p_audio
=
&
p_sys
->
p_audios
[
i
];
if
(
p_audio
->
i_channel
!=
-
1
&&
p_audio
->
p_es
!=
NULL
)
{
block_t
*
p_block
=
block_
New
(
p_demux
,
p_sys
->
i_ablock_size
);
block_t
*
p_block
=
block_
Alloc
(
p_sys
->
i_ablock_size
);
if
(
unlikely
(
!
p_block
)
)
return
VLC_ENOMEM
;
SparseCopy
(
(
int16_t
*
)
p_block
->
p_buffer
,
(
const
int16_t
*
)
p_buffer
,
...
...
modules/access/linsys/linsys_sdi.c
View file @
52707967
...
...
@@ -410,7 +410,7 @@ static int NewFrame( demux_t *p_demux )
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
p_sys
->
p_current_picture
=
block_
New
(
p_demux
,
p_sys
->
i_block_size
);
p_sys
->
p_current_picture
=
block_
Alloc
(
p_sys
->
i_block_size
);
if
(
unlikely
(
!
p_sys
->
p_current_picture
)
)
return
VLC_ENOMEM
;
p_sys
->
p_y
=
p_sys
->
p_current_picture
->
p_buffer
;
...
...
@@ -801,8 +801,7 @@ static int DecodeTelx( demux_t *p_demux )
int
i_nb_slices_rounded
=
3
+
(
i_nb_slices
/
4
)
*
4
;
int
i
;
uint8_t
*
p
;
block_t
*
p_block
=
block_New
(
p_demux
,
1
+
i_nb_slices_rounded
*
46
);
block_t
*
p_block
=
block_Alloc
(
1
+
i_nb_slices_rounded
*
46
);
if
(
unlikely
(
!
p_block
)
)
return
VLC_ENOMEM
;
p_block
->
p_buffer
[
0
]
=
0x10
;
/* FIXME ? data_identifier */
...
...
@@ -939,7 +938,7 @@ static int DecodeAudio( demux_t *p_demux, sdi_audio_t *p_audio )
return
VLC_EGENERIC
;
}
p_block
=
block_
New
(
p_demux
,
p_audio
->
i_nb_samples
*
sizeof
(
int16_t
)
*
2
);
p_block
=
block_
Alloc
(
p_audio
->
i_nb_samples
*
sizeof
(
int16_t
)
*
2
);
if
(
unlikely
(
!
p_block
)
)
return
VLC_ENOMEM
;
p_block
->
i_dts
=
p_block
->
i_pts
=
p_sys
->
i_next_date
...
...
modules/access/mms/mmsh.c
View file @
52707967
...
...
@@ -345,7 +345,7 @@ static block_t *Block( access_t *p_access )
const
size_t
i_offset
=
p_access
->
info
.
i_pos
-
p_sys
->
i_start
;
const
size_t
i_copy
=
p_sys
->
i_header
-
i_offset
;
block_t
*
p_block
=
block_
New
(
p_access
,
i_copy
);
block_t
*
p_block
=
block_
Alloc
(
i_copy
);
if
(
!
p_block
)
return
NULL
;
...
...
@@ -364,7 +364,7 @@ static block_t *Block( access_t *p_access )
if
(
__MAX
(
p_sys
->
i_packet_used
,
p_sys
->
i_packet_length
)
<
i_packet_min
)
i_padding
=
i_packet_min
-
__MAX
(
p_sys
->
i_packet_used
,
p_sys
->
i_packet_length
);
block_t
*
p_block
=
block_
New
(
p_access
,
i_copy
+
i_padding
);
block_t
*
p_block
=
block_
Alloc
(
i_copy
+
i_padding
);
if
(
!
p_block
)
return
NULL
;
...
...
modules/access/mms/mmstu.c
View file @
52707967
...
...
@@ -412,7 +412,7 @@ static block_t *Block( access_t *p_access )
{
const
size_t
i_copy
=
p_sys
->
i_header
-
p_access
->
info
.
i_pos
;
block_t
*
p_block
=
block_
New
(
p_access
,
i_copy
);
block_t
*
p_block
=
block_
Alloc
(
i_copy
);
if
(
!
p_block
)
return
NULL
;
...
...
@@ -430,7 +430,7 @@ static block_t *Block( access_t *p_access )
if
(
__MAX
(
p_sys
->
i_media
,
p_sys
->
i_media_used
)
<
p_sys
->
i_packet_length
)
i_padding
=
p_sys
->
i_packet_length
-
__MAX
(
p_sys
->
i_media
,
p_sys
->
i_media_used
);
block_t
*
p_block
=
block_
New
(
p_access
,
i_copy
+
i_padding
);
block_t
*
p_block
=
block_
Alloc
(
i_copy
+
i_padding
);
if
(
!
p_block
)
return
NULL
;
...
...
modules/access/oss.c
View file @
52707967
...
...
@@ -294,7 +294,7 @@ static block_t* GrabAudio( demux_t *p_demux )
block_t
*
p_block
;
if
(
p_sys
->
p_block
)
p_block
=
p_sys
->
p_block
;
else
p_block
=
block_
New
(
p_demux
,
p_sys
->
i_max_frame_size
);
else
p_block
=
block_
Alloc
(
p_sys
->
i_max_frame_size
);
if
(
!
p_block
)
{
...
...
modules/access/qtcapture.m
View file @
52707967
...
...
@@ -417,7 +417,7 @@ static int Demux(demux_t *p_demux)
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
block_t
*
p_block
;
p_block
=
block_
New
(
p_demux
,
p_sys
->
width
*
p_sys
->
height
*
2
/* FIXME */
);
p_block
=
block_
Alloc
(
p_sys
->
width
*
p_sys
->
height
*
2
/* FIXME */
);
if
(
!
p_block
)
{
msg_Err
(
p_demux
,
"cannot get block"
);
return
0
;
...
...
modules/access/qtsound.m
View file @
52707967
...
...
@@ -502,7 +502,7 @@ static int Demux(demux_t *p_demux)
block_t
*
p_blocka
;
NSAutoreleasePool
*
pool
;
p_blocka
=
block_
New
(
p_demux
,
p_sys
->
i_audio_max_buffer_size
);
p_blocka
=
block_
Alloc
(
p_sys
->
i_audio_max_buffer_size
);
if
(
!
p_blocka
)
{
msg_Err
(
p_demux
,
"cannot get audio block"
);
...
...
modules/access/rtsp/access.c
View file @
52707967
...
...
@@ -230,7 +230,7 @@ static int Open( vlc_object_t *p_this )
goto
error
;
}
p_sys
->
p_header
=
block_
New
(
p_access
,
4096
);
p_sys
->
p_header
=
block_
Alloc
(
4096
);
p_sys
->
p_header
->
i_buffer
=
rmff_dump_header
(
h
,
(
char
*
)
p_sys
->
p_header
->
p_buffer
,
1024
);
rmff_free_header
(
h
);
...
...
@@ -283,7 +283,7 @@ static block_t *BlockRead( access_t *p_access )
i_size
=
real_get_rdt_chunk_header
(
p_access
->
p_sys
->
p_rtsp
,
&
pheader
);
if
(
i_size
<=
0
)
return
NULL
;
p_block
=
block_
New
(
p_access
,
i_size
);
p_block
=
block_
Alloc
(
i_size
);
p_block
->
i_buffer
=
real_get_rdt_chunk
(
p_access
->
p_sys
->
p_rtsp
,
&
pheader
,
&
p_block
->
p_buffer
);
...
...
modules/access/screen/mac.c
View file @
52707967
...
...
@@ -325,7 +325,7 @@ block_t *screen_Capture( demux_t *p_demux )
i_size
=
p_sys
->
fmt
.
video
.
i_height
*
p_sys
->
fmt
.
video
.
i_width
*
4
;
if
(
!
(
p_block
=
block_
New
(
p_demux
,
i_size
)
)
)
if
(
!
(
p_block
=
block_
Alloc
(
i_size
)
)
)
{
msg_Warn
(
p_demux
,
"cannot get block"
);
return
NULL
;
...
...
modules/access/sftp.c
View file @
52707967
...
...
@@ -277,7 +277,7 @@ static block_t* Block( access_t* p_access )
/* Allocate the buffer we need */
size_t
i_len
=
__MIN
(
p_access
->
p_sys
->
i_read_size
,
p_access
->
info
.
i_size
-
p_access
->
info
.
i_pos
);
block_t
*
p_block
=
block_
New
(
p_access
,
i_len
);
block_t
*
p_block
=
block_
Alloc
(
i_len
);
if
(
!
p_block
)
return
NULL
;
...
...
modules/access/udp.c
View file @
52707967
...
...
@@ -206,7 +206,7 @@ static block_t *BlockUDP( access_t *p_access )
return
NULL
;
/* Read data */
p_block
=
block_
New
(
p_access
,
MTU
);
p_block
=
block_
Alloc
(
MTU
);
len
=
net_Read
(
p_access
,
(
intptr_t
)
p_sys
,
NULL
,
p_block
->
p_buffer
,
MTU
,
false
);
if
(
len
<
0
)
...
...
modules/access/vcd/vcd.c
View file @
52707967
...
...
@@ -351,7 +351,7 @@ static block_t *Block( access_t *p_access )
}
/* Do the actual reading */
if
(
i_blocks
<
0
||
!
(
p_block
=
block_
New
(
p_access
,
i_blocks
*
VCD_DATA_SIZE
)
)
)
if
(
i_blocks
<
0
||
!
(
p_block
=
block_
Alloc
(
i_blocks
*
VCD_DATA_SIZE
)
)
)
{
msg_Err
(
p_access
,
"cannot get a new block of size: %i"
,
i_blocks
*
VCD_DATA_SIZE
);
...
...
modules/access/vcdx/access.c
View file @
52707967
...
...
@@ -150,7 +150,7 @@ VCDReadBlock( access_t * p_access )
(
long
unsigned
int
)
p_vcdplayer
->
i_lsn
);
/* Allocate a block for the reading */
if
(
!
(
p_block
=
block_
New
(
p_access
,
i_blocks
*
M2F2_SECTOR_SIZE
)
)
)
if
(
!
(
p_block
=
block_
Alloc
(
i_blocks
*
M2F2_SECTOR_SIZE
)
)
)
{
msg_Err
(
p_access
,
"cannot get a new block of size: %i"
,
i_blocks
*
M2F2_SECTOR_SIZE
);
...
...
modules/codec/a52.c
View file @
52707967
...
...
@@ -400,7 +400,7 @@ static block_t *GetSoutBuffer( decoder_t *p_dec )
{
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
block_t
*
p_block
=
block_
New
(
p_dec
,
p_sys
->
frame
.
i_size
);
block_t
*
p_block
=
block_
Alloc
(
p_sys
->
frame
.
i_size
);
if
(
p_block
)
{
p_block
->
i_pts
=
p_block
->
i_dts
=
date_Get
(
&
p_sys
->
end_date
);
...
...
modules/codec/avcodec/encoder.c
View file @
52707967
...
...
@@ -854,7 +854,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
const
int
bytesPerPixel
=
p_enc
->
fmt_out
.
video
.
i_bits_per_pixel
?
p_enc
->
fmt_out
.
video
.
i_bits_per_pixel
/
8
:
3
;
const
int
blocksize
=
__MAX
(
FF_MIN_BUFFER_SIZE
,
bytesPerPixel
*
p_sys
->
p_context
->
height
*
p_sys
->
p_context
->
width
+
200
);
block_t
*
p_block
=
block_
New
(
p_enc
,
blocksize
);
block_t
*
p_block
=
block_
Alloc
(
blocksize
);
if
(
likely
(
p_pict
)
)
{
AVFrame
*
frame
;
...
...
@@ -1035,7 +1035,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
{
msg_Dbg
(
p_enc
,
"Flushing.."
);
do
{
p_block
=
block_
New
(
p_enc
,
p_sys
->
i_buffer_out
);
p_block
=
block_
Alloc
(
p_sys
->
i_buffer_out
);
av_init_packet
(
&
packet
);
packet
.
data
=
p_block
->
p_buffer
;
packet
.
size
=
p_block
->
i_buffer
;
...
...
@@ -1058,7 +1058,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
frame
->
pts
=
p_aout_buf
->
i_pts
;
p_block
=
block_
New
(
p_enc
,
p_sys
->
i_buffer_out
);
p_block
=
block_
Alloc
(
p_sys
->
i_buffer_out
);
av_init_packet
(
&
packet
);
packet
.
data
=
p_block
->
p_buffer
;
packet
.
size
=
p_block
->
i_buffer
;
...
...
modules/codec/dirac.c
View file @
52707967
...
...
@@ -855,7 +855,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
/* store dts in a queue, so that they appear in order in
* coded order */
p_block
=
block_
New
(
p_enc
,
1
);
p_block
=
block_
Alloc
(
1
);
if
(
!
p_block
)
return
NULL
;
p_block
->
i_dts
=
p_pic
->
date
-
p_sys
->
i_pts_offset
;
...
...
@@ -870,7 +870,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
StorePicturePTS
(
p_enc
,
p_sys
->
i_input_picnum
,
p_pic
->
date
+
p_sys
->
i_field_time
);
p_sys
->
i_input_picnum
++
;
p_block
=
block_
New
(
p_enc
,
1
);
p_block
=
block_
Alloc
(
1
);
if
(
!
p_block
)
return
NULL
;
p_block
->
i_dts
=
p_pic
->
date
-
p_sys
->
i_pts_offset
+
p_sys
->
i_field_time
;
...
...
@@ -891,7 +891,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
uint32_t
pic_num
;
/* extract data from encoder temporary buffer. */
p_block
=
block_
New
(
p_enc
,
p_sys
->
p_dirac
->
enc_buf
.
size
);
p_block
=
block_
Alloc
(
p_sys
->
p_dirac
->
enc_buf
.
size
);
if
(
!
p_block
)
return
NULL
;
memcpy
(
p_block
->
p_buffer
,
p_sys
->
p_dirac
->
enc_buf
.
buffer
,
...
...
modules/codec/dmo/dmo.c
View file @
52707967
...
...
@@ -1542,7 +1542,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data )
p_enc
->
fmt_in
.
video
.
i_height
*
p_enc
->
fmt_in
.
video
.
i_bits_per_pixel
/
8
;
p_block_in
=
block_
New
(
p_enc
,
i_buffer
);
p_block_in
=
block_
Alloc
(
i_buffer
);
/* Copy picture stride by stride */
p_dst
=
p_block_in
->
p_buffer
;
...
...
@@ -1566,7 +1566,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data )
else
{
block_t
*
p_aout_buffer
=
(
block_t
*
)
p_data
;
p_block_in
=
block_
New
(
p_enc
,
p_aout_buffer
->
i_buffer
);
p_block_in
=
block_
Alloc
(
p_aout_buffer
->
i_buffer
);
memcpy
(
p_block_in
->
p_buffer
,
p_aout_buffer
->
p_buffer
,
p_block_in
->
i_buffer
);
...
...
@@ -1609,7 +1609,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data )
block_t
*
p_block_out
;
CMediaBuffer
*
p_out
;
p_block_out
=
block_
New
(
p_enc
,
p_sys
->
i_min_output
);
p_block_out
=
block_
Alloc
(
p_sys
->
i_min_output
);
p_block_out
->
i_buffer
=
0
;
p_out
=
CMediaBufferCreate
(
p_block_out
,
p_sys
->
i_min_output
,
false
);
memset
(
&
db
,
0
,
sizeof
(
db
)
);
...
...
modules/codec/dts.c
View file @
52707967
...
...
@@ -425,7 +425,7 @@ static block_t *GetSoutBuffer( decoder_t *p_dec )
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
block_t
*
p_block
;
p_block
=
block_
New
(
p_dec
,
p_sys
->
i_frame_size
);
p_block
=
block_
Alloc
(
p_sys
->
i_frame_size
);
if
(
p_block
==
NULL
)
return
NULL
;
p_block
->
i_pts
=
p_block
->
i_dts
=
date_Get
(
&
p_sys
->
end_date
);
...
...
modules/codec/dvbsub.c
View file @
52707967
...
...
@@ -1994,7 +1994,7 @@ static block_t *Encode( encoder_t *p_enc, subpicture_t *p_subpic )
#ifdef DEBUG_DVBSUB
msg_Dbg
(
p_enc
,
"encoding subpicture"
);
#endif
p_block
=
block_
New
(
p_enc
,
64000
);
p_block
=
block_
Alloc
(
64000
);
bs_init
(
s
,
p_block
->
p_buffer
,
p_block
->
i_buffer
);
bs_write
(
s
,
8
,
0x20
);
/* Data identifier */
...
...
@@ -2021,7 +2021,7 @@ static block_t *Encode( encoder_t *p_enc, subpicture_t *p_subpic )
p_block
->
i_length
=
p_subpic
->
i_stop
-
p_subpic
->
i_start
;
/* Send another (empty) subtitle to signal the end of display */
p_block_stop
=
block_
New
(
p_enc
,
64000
);
p_block_stop
=
block_
Alloc
(
64000
);
bs_init
(
s
,
p_block_stop
->
p_buffer
,
p_block_stop
->
i_buffer
);
bs_write
(
s
,
8
,
0x20
);
/* Data identifier */
bs_write
(
s
,
8
,
0x0
);
/* Subtitle stream id */
...
...
modules/codec/fdkaac.c
View file @
52707967
...
...
@@ -434,7 +434,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
in_buf
.
bufElSizes
=
&
in_elem_size
;
}
block_t
*
p_block
;
p_block
=
block_
New
(
p_enc
,
p_sys
->
i_maxoutputsize
);
p_block
=
block_
Alloc
(
p_sys
->
i_maxoutputsize
);
p_block
->
i_buffer
=
p_sys
->
i_maxoutputsize
;
out_ptr
=
p_block
->
p_buffer
;
out_size
=
p_block
->
i_buffer
;
...
...
modules/codec/flac.c
View file @
52707967
...
...
@@ -452,7 +452,7 @@ static void ProcessHeader( decoder_t *p_dec )
/* Decode STREAMINFO */
msg_Dbg
(
p_dec
,
"decode STREAMINFO"
);
p_sys
->
p_block
=
block_
New
(
p_dec
,
p_dec
->
fmt_in
.
i_extra
);
p_sys
->
p_block
=
block_
Alloc
(
p_dec
->
fmt_in
.
i_extra
);
memcpy
(
p_sys
->
p_block
->
p_buffer
,
p_dec
->
fmt_in
.
p_extra
,
p_dec
->
fmt_in
.
i_extra
);
FLAC__stream_decoder_process_until_end_of_metadata
(
p_sys
->
p_flac
);
...
...
@@ -641,7 +641,7 @@ EncoderWriteCallback( const FLAC__StreamEncoder *encoder,
return
FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE
;
}
p_block
=
block_
New
(
p_enc
,
bytes
);
p_block
=
block_
Alloc
(
bytes
);
memcpy
(
p_block
->
p_buffer
,
buffer
,
bytes
);
p_block
->
i_dts
=
p_block
->
i_pts
=
p_sys
->
i_pts
;
...
...
modules/codec/libmpeg2.c
View file @
52707967
...
...
@@ -703,7 +703,7 @@ static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] )
if
(
p_sys
->
cc
.
i_data
<=
0
)
return
NULL
;
p_cc
=
block_
New
(
p_dec
,
p_sys
->
cc
.
i_data
);
p_cc
=
block_
Alloc
(
p_sys
->
cc
.
i_data
);
if
(
p_cc
)
{
memcpy
(
p_cc
->
p_buffer
,
p_sys
->
cc
.
p_data
,
p_sys
->
cc
.
i_data
);
...
...
modules/codec/lpcm.c
View file @
52707967
...
...
@@ -542,7 +542,7 @@ static block_t *EncodeFrames( encoder_t *p_enc, block_t *p_aout_buf )
for
(
int
i
=
0
;
i
<
i_num_frames
;
++
i
)
{
block_t
*
p_block
=
block_
New
(
p_enc
,
i_frame_size
);
block_t
*
p_block
=
block_
Alloc
(
i_frame_size
);
if
(
!
p_block
)
return
NULL
;
...
...
modules/codec/mpeg_audio.c
View file @
52707967
...
...
@@ -552,7 +552,7 @@ static block_t *GetSoutBuffer( decoder_t *p_dec )
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
block_t
*
p_block
;
p_block
=
block_
New
(
p_dec
,
p_sys
->
i_frame_size
);
p_block
=
block_
Alloc
(
p_sys
->
i_frame_size
);
if
(
p_block
==
NULL
)
return
NULL
;
p_block
->
i_pts
=
p_block
->
i_dts
=
date_Get
(
&
p_sys
->
end_date
);
...
...
modules/codec/omxil/omxil.c
View file @
52707967
...
...
@@ -1614,7 +1614,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic )
{
/* We're not in direct rendering mode.
* Get a new block and copy the content */
p_block
=
block_
New
(
p_dec
,
p_header
->
nFilledLen
);
p_block
=
block_
Alloc
(
p_header
->
nFilledLen
);
memcpy
(
p_block
->
p_buffer
,
p_header
->
pBuffer
,
p_header
->
nFilledLen
);
}
...
...
modules/codec/schroedinger.c
View file @
52707967
...
...
@@ -1483,7 +1483,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
/* store dts in a queue, so that they appear in order in
* coded order */
p_block
=
block_
New
(
p_enc
,
1
);
p_block
=
block_
Alloc
(
1
);
if
(
!
p_block
)
return
NULL
;
p_block
->
i_dts
=
p_pic
->
date
-
p_sys
->
i_pts_offset
;
...
...
@@ -1497,7 +1497,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
StorePicturePTS
(
p_enc
,
p_sys
->
i_input_picnum
,
p_pic
->
date
+
p_sys
->
i_field_time
);
p_sys
->
i_input_picnum
++
;
p_block
=
block_
New
(
p_enc
,
1
);
p_block
=
block_
Alloc
(
1
);
if
(
!
p_block
)
return
NULL
;
p_block
->
i_dts
=
p_pic
->
date
-
p_sys
->
i_pts_offset
+
p_sys
->
i_field_time
;
...
...
@@ -1527,7 +1527,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
uint32_t
u_pic_num
;
int
i_presentation_frame
;
p_enc_buf
=
schro_encoder_pull
(
p_sys
->
p_schro
,
&
i_presentation_frame
);
p_block
=
block_
New
(
p_enc
,
p_enc_buf
->
length
);
p_block
=
block_
Alloc
(
p_enc_buf
->
length
);
if
(
!
p_block
)
return
NULL
;
...
...
modules/codec/shine/shine_mod.c
View file @
52707967
...
...
@@ -148,7 +148,7 @@ static block_t *GetPCM( encoder_t *p_enc, block_t *p_block )
while
(
p_sys
->
i_buffer
+
p_block
->
i_buffer
>=
pcm_chunk_size
)
{
unsigned
int
i_buffer
=
0
;
p_pcm_block
=
block_
New
(
p_enc
,
pcm_chunk_size
);
p_pcm_block
=
block_
Alloc
(
pcm_chunk_size
);
if
(
!
p_pcm_block
)
break
;
...
...
@@ -224,7 +224,7 @@ static block_t *EncodeFrame( encoder_t *p_enc, block_t *p_block )
encode_frame
(
(
char
*
)
p_pcm_block
->
p_buffer
,
chunk
);
block_Release
(
p_pcm_block
);
block_t
*
p_mp3_block
=
block_
New
(
p_enc
,
chunk
->
enc_size
);
block_t
*
p_mp3_block
=
block_
Alloc
(
chunk
->
enc_size
);
if
(
!
p_mp3_block
)
break
;