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
12
Merge Requests
12
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
22d851e1
Commit
22d851e1
authored
Jan 25, 2003
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* all : fixed some memory leaks thanks valgrind.
parent
25eea88d
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
222 additions
and
167 deletions
+222
-167
modules/demux/aac/demux.c
modules/demux/aac/demux.c
+68
-60
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+2
-2
modules/demux/avi/avi.c
modules/demux/avi/avi.c
+4
-2
modules/demux/avi/libavi.c
modules/demux/avi/libavi.c
+16
-2
modules/demux/avi/libavi.h
modules/demux/avi/libavi.h
+8
-1
modules/demux/demuxdump.c
modules/demux/demuxdump.c
+9
-9
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+58
-54
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+7
-3
modules/demux/wav/wav.c
modules/demux/wav/wav.c
+50
-34
No files found.
modules/demux/aac/demux.c
View file @
22d851e1
...
...
@@ -2,15 +2,15 @@
* demux.c : Raw aac Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: demux.c,v 1.
4 2003/01/20 13:03:03
fenrir Exp $
* $Id: demux.c,v 1.
5 2003/01/25 16:58:34
fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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
...
...
@@ -35,9 +35,9 @@
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static
int
Activate
(
vlc_object_t
*
);
static
int
Demux
(
input_thread_t
*
);
static
int
Activate
(
vlc_object_t
*
);
static
int
Demux
(
input_thread_t
*
);
static
void
Deactivate
(
vlc_object_t
*
);
/*****************************************************************************
* Module descriptor
...
...
@@ -50,9 +50,9 @@ vlc_module_begin();
vlc_module_end
();
/*****************************************************************************
* Definitions of structures and functions used by this plugins
* Definitions of structures and functions used by this plugins
*****************************************************************************/
#define FREE( p ) if( p ) { free( p ); (p) = NULL; }
/* XXX set this to 0 to avoid problem with PS XXX */
/* but with some file or web radio will failed to detect */
/* it's you to choose */
...
...
@@ -84,22 +84,22 @@ typedef struct adts_header_s
int
i_adts_buffer_fullness
;
int
i_no_raw_data_blocks_in_frame
;
int
i_crc_check
;
}
adts_header_t
;
/* Not yet used */
typedef
struct
adif_header_s
{
int
b_copyright_id_present
;
u8
i_copyright_id
[
10
];
int
b_original_copy
;
int
b_copyright_id_present
;
uint8_t
i_copyright_id
[
10
];
int
i_home
;
int
i_bitstream_type
;
int
i_bitrate
;
int
i_num_program_config_elements
;
int
adif_buffer_fullness
;
int
b_original_copy
;
int
i_home
;
int
i_bitstream_type
;
int
i_bitrate
;
int
i_num_program_config_elements
;
int
adif_buffer_fullness
;
// program_config_element
...
...
@@ -131,16 +131,16 @@ struct demux_sys_t
* bit_* : function to get a bitstream from a memory buffer
****************************************************************************
*
****************************************************************************/
****************************************************************************/
typedef
struct
bit_s
{
u
8
*
p_buffer
;
u
int8_t
*
p_buffer
;
int
i_buffer
;
int
i_mask
;
}
bit_t
;
static
void
bit_init
(
bit_t
*
p_bit
,
u
8
*
p_buffer
,
u
int8_t
*
p_buffer
,
int
i_buffer
)
{
p_bit
->
p_buffer
=
p_buffer
;
...
...
@@ -148,15 +148,15 @@ static void bit_init( bit_t *p_bit,
p_bit
->
i_mask
=
0x80
;
}
static
u
32
bit_get
(
bit_t
*
p_bit
)
static
u
int32_t
bit_get
(
bit_t
*
p_bit
)
{
u
32
i_bit
;
u
int32_t
i_bit
;
if
(
p_bit
->
i_buffer
<=
0
)
{
return
(
0
);
}
i_bit
=
(
p_bit
->
p_buffer
[
0
]
&
p_bit
->
i_mask
)
?
1
:
0
;
p_bit
->
i_mask
>>=
1
;
if
(
!
p_bit
->
i_mask
)
{
...
...
@@ -167,9 +167,9 @@ static u32 bit_get( bit_t *p_bit )
return
(
i_bit
);
}
static
u
32
bit_gets
(
bit_t
*
p_bit
,
int
i_count
)
static
u
int32_t
bit_gets
(
bit_t
*
p_bit
,
int
i_count
)
{
u
32
i_bits
;
u
int32_t
i_bits
;
i_bits
=
0
;
for
(
;
i_count
>
0
;
i_count
--
)
{
...
...
@@ -185,7 +185,7 @@ static u32 bit_gets( bit_t *p_bit, int i_count )
* SkipBytes : skip bytes :) not yet uoptimised ( read bytes to be skipped )
*
* ReadPes : read data and make a PES
*
*
*****************************************************************************/
static
int
SkipBytes
(
input_thread_t
*
p_input
,
int
i_size
)
{
...
...
@@ -205,14 +205,14 @@ static int SkipBytes( input_thread_t *p_input, int i_size )
return
(
1
);
}
static
int
ReadPES
(
input_thread_t
*
p_input
,
pes_packet_t
**
pp_pes
,
static
int
ReadPES
(
input_thread_t
*
p_input
,
pes_packet_t
**
pp_pes
,
int
i_size
)
{
pes_packet_t
*
p_pes
;
*
pp_pes
=
NULL
;
if
(
!
(
p_pes
=
input_NewPES
(
p_input
->
p_method_data
))
)
{
msg_Err
(
p_input
,
"cannot allocate new PES"
);
...
...
@@ -224,8 +224,8 @@ static int ReadPES( input_thread_t *p_input,
data_packet_t
*
p_data
;
int
i_read
;
if
(
(
i_read
=
input_SplitBuffer
(
p_input
,
&
p_data
,
if
(
(
i_read
=
input_SplitBuffer
(
p_input
,
&
p_data
,
__MIN
(
i_size
,
1024
)
)
)
<=
0
)
{
input_DeletePES
(
p_input
->
p_method_data
,
p_pes
);
...
...
@@ -256,7 +256,7 @@ static int ReadPES( input_thread_t *p_input,
static
int
GetADIF
(
input_thread_t
*
p_input
,
adif_header_t
*
p_adif
)
{
u
8
*
p_peek
;
u
int8_t
*
p_peek
;
int
i_size
;
if
(
(
i_size
=
input_Peek
(
p_input
,
&
p_peek
,
60
)
)
<
60
)
...
...
@@ -269,9 +269,9 @@ static int GetADIF( input_thread_t *p_input,
{
return
(
0
);
}
/* we now that we have an adif header */
// return( 1 );
return
(
0
);
/* need some work */
}
...
...
@@ -285,7 +285,7 @@ static int GetADTS( input_thread_t *p_input,
int
i_max_pos
,
int
*
pi_skip
)
{
u
8
*
p_peek
;
u
int8_t
*
p_peek
;
int
i_size
;
bit_t
bit
;
...
...
@@ -315,7 +315,7 @@ static int GetADTS( input_thread_t *p_input,
bit_init
(
&
bit
,
p_peek
,
i_size
);
bit_gets
(
&
bit
,
12
);
/* synchro bits */
p_adts
->
i_id
=
bit_get
(
&
bit
);
p_adts
->
i_layer
=
bit_gets
(
&
bit
,
2
);
p_adts
->
i_protection_absent
=
bit_get
(
&
bit
);
...
...
@@ -354,7 +354,7 @@ static void ExtractConfiguration( demux_sys_t *p_aac )
p_aac
->
i_samplerate_index
=
p_aac
->
adts_header
.
i_samplerate_index
;
p_aac
->
i_object_type
=
p_aac
->
adts_header
.
i_profile
;
p_aac
->
i_samplerate
=
i_aac_samplerate
[
p_aac
->
i_samplerate_index
];
p_aac
->
i_channels
=
p_aac
->
adts_header
.
i_channel_configuration
;
p_aac
->
i_channels
=
p_aac
->
adts_header
.
i_channel_configuration
;
if
(
p_aac
->
i_channels
>
6
)
{
/* I'm not sure of that, got from faad */
...
...
@@ -381,7 +381,7 @@ static void ExtractConfiguration( demux_sys_t *p_aac )
static
int
CheckPS
(
input_thread_t
*
p_input
)
{
u
8
*
p_peek
;
u
int8_t
*
p_peek
;
int
i_size
=
input_Peek
(
p_input
,
&
p_peek
,
8196
);
while
(
i_size
>
4
)
...
...
@@ -406,7 +406,7 @@ static int Activate( vlc_object_t * p_this )
demux_sys_t
*
p_aac
;
input_info_category_t
*
p_category
;
module_t
*
p_id3
;
int
i_skip
;
int
b_forced
;
...
...
@@ -422,19 +422,19 @@ static int Activate( vlc_object_t * p_this )
b_forced
=
(
(
*
p_input
->
psz_demux
)
&&
(
!
strncmp
(
p_input
->
psz_demux
,
"aac"
,
10
)
)
)
?
1
:
0
;
/* check if it can be a ps stream */
if
(
!
b_forced
&&
CheckPS
(
p_input
)
)
{
return
(
-
1
);
}
/* skip possible id3 header */
/* skip possible id3 header */
p_id3
=
module_Need
(
p_input
,
"id3"
,
NULL
);
if
(
p_id3
)
{
module_Unneed
(
p_input
,
p_id3
);
}
/* allocate p_aac */
if
(
!
(
p_aac
=
malloc
(
sizeof
(
demux_sys_t
)
)
)
)
{
...
...
@@ -442,7 +442,7 @@ static int Activate( vlc_object_t * p_this )
return
(
-
1
);
}
memset
(
p_aac
,
0
,
sizeof
(
demux_sys_t
)
);
/* Now check for adif/adts header */
i_skip
=
0
;
if
(
GetADIF
(
p_input
,
&
p_aac
->
adif_header
)
)
...
...
@@ -454,8 +454,8 @@ static int Activate( vlc_object_t * p_this )
return
(
-
1
);
}
else
if
(
GetADTS
(
p_input
,
&
p_aac
->
adts_header
,
if
(
GetADTS
(
p_input
,
&
p_aac
->
adts_header
,
b_forced
?
8000
:
0
,
&
i_skip
)
)
{
...
...
@@ -478,7 +478,7 @@ static int Activate( vlc_object_t * p_this )
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
msg_Err
(
p_input
,
"cannot init stream"
);
return
(
-
1
);
}
}
if
(
input_AddProgram
(
p_input
,
0
,
0
)
==
NULL
)
{
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
...
...
@@ -487,9 +487,9 @@ static int Activate( vlc_object_t * p_this )
}
p_input
->
stream
.
pp_programs
[
0
]
->
b_is_ok
=
0
;
p_input
->
stream
.
p_selected_program
=
p_input
->
stream
.
pp_programs
[
0
];
/* create our ES */
p_aac
->
p_es
=
input_AddES
(
p_input
,
/* create our ES */
p_aac
->
p_es
=
input_AddES
(
p_input
,
p_input
->
stream
.
p_selected_program
,
1
,
/* id */
0
);
...
...
@@ -499,7 +499,7 @@ static int Activate( vlc_object_t * p_this )
msg_Err
(
p_input
,
"out of memory"
);
return
(
-
1
);
}
p_aac
->
p_es
->
i_stream_id
=
1
;
p_aac
->
p_es
->
i_fourcc
=
VLC_FOURCC
(
'm'
,
'p'
,
'4'
,
'a'
);
p_aac
->
p_es
->
i_cat
=
AUDIO_ES
;
...
...
@@ -509,7 +509,7 @@ static int Activate( vlc_object_t * p_this )
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
if
(
p_aac
->
b_adif_header
)
{
...
...
@@ -547,7 +547,7 @@ static int Activate( vlc_object_t * p_this )
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
p_category
=
input_InfoCategory
(
p_input
,
"aac"
);
input_AddInfo
(
p_category
,
"input type"
,
"MPEG-%d AAC"
,
p_aac
->
adts_header
.
i_id
==
1
?
2
:
4
);
...
...
@@ -562,7 +562,7 @@ static int Activate( vlc_object_t * p_this )
}
p_input
->
p_demux_data
=
p_aac
;
return
(
0
);
}
...
...
@@ -576,7 +576,7 @@ static int Demux( input_thread_t * p_input )
{
int
i_skip
;
int
i_found
;
pes_packet_t
*
p_pes
;
demux_sys_t
*
p_aac
=
p_input
->
p_demux_data
;
...
...
@@ -589,7 +589,7 @@ static int Demux( input_thread_t * p_input )
else
if
(
p_aac
->
b_adts_header
)
{
i_found
=
GetADTS
(
p_input
,
i_found
=
GetADTS
(
p_input
,
&
p_aac
->
adts_header
,
8000
,
&
i_skip
);
...
...
@@ -599,7 +599,7 @@ static int Demux( input_thread_t * p_input )
return
(
-
1
);
}
ExtractConfiguration
(
p_aac
);
/* skip garbage bytes */
if
(
i_skip
>
0
)
{
...
...
@@ -614,11 +614,11 @@ static int Demux( input_thread_t * p_input )
msg_Info
(
p_input
,
"can't find next frame"
);
return
(
0
);
}
input_ClockManageRef
(
p_input
,
p_input
->
stream
.
p_selected_program
,
p_aac
->
i_pts
);
if
(
!
ReadPES
(
p_input
,
&
p_pes
,
p_aac
->
i_aac_frame_length
)
)
{
msg_Warn
(
p_input
,
...
...
@@ -642,10 +642,18 @@ static int Demux( input_thread_t * p_input )
}
/* Update date information */
p_aac
->
i_pts
+=
(
mtime_t
)
90000
*
p_aac
->
i_pts
+=
(
mtime_t
)
90000
*
(
mtime_t
)
p_aac
->
i_framelength
/
(
mtime_t
)
p_aac
->
i_samplerate
;
return
(
1
);
}
static
void
Deactivate
(
vlc_object_t
*
p_this
)
{
input_thread_t
*
p_input
=
(
input_thread_t
*
)
p_this
;
// demux_sys_t *p_aac = p_input->p_demux_data;
FREE
(
p_input
->
p_demux_data
);
}
modules/demux/asf/asf.c
View file @
22d851e1
...
...
@@ -2,7 +2,7 @@
* asf.c : ASFv01 file input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: asf.c,v 1.1
7 2003/01/23 15:07:20
fenrir Exp $
* $Id: asf.c,v 1.1
8 2003/01/25 16:58:34
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -858,7 +858,7 @@ static void Deactivate( vlc_object_t * p_this )
}
#undef p_stream
}
FREE
(
p_input
->
p_demux_data
);
#undef FREE
}
modules/demux/avi/avi.c
View file @
22d851e1
...
...
@@ -2,7 +2,7 @@
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.3
0 2003/01/25 03:12:20
fenrir Exp $
* $Id: avi.c,v 1.3
1 2003/01/25 16:58:34
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -52,7 +52,7 @@ static int AVIDemux_Seekable ( input_thread_t * );
static
int
AVIDemux_UnSeekable
(
input_thread_t
*
p_input
);
#define AVIEnd(a) __AVIEnd(VLC_OBJECT(a))
#define FREE( p ) if( p ) { free( p ); (p) = NULL; }
/*****************************************************************************
* Module descriptor
*****************************************************************************/
...
...
@@ -793,6 +793,8 @@ static void __AVIEnd ( vlc_object_t * p_this )
}
#endif
AVI_ChunkFreeRoot
(
p_input
,
&
p_avi
->
ck_root
);
FREE
(
p_input
->
p_demux_data
);
}
/*****************************************************************************
...
...
modules/demux/avi/libavi.c
View file @
22d851e1
...
...
@@ -2,7 +2,7 @@
* libavi.c :
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libavi.c,v 1.1
4 2003/01/20 13:01:53
fenrir Exp $
* $Id: libavi.c,v 1.1
5 2003/01/25 16:58:34
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -520,6 +520,7 @@ static int AVI_ChunkRead_strf( input_thread_t *p_input,
switch
(
p_strh
->
strh
.
i_type
)
{
case
(
AVIFOURCC_auds
):
p_chk
->
strf
.
auds
.
i_cat
=
AUDIO_ES
;
p_chk
->
strf
.
auds
.
p_wf
=
malloc
(
p_chk
->
common
.
i_chunk_size
);
AVI_READ2BYTES
(
p_chk
->
strf
.
auds
.
p_wf
->
wFormatTag
);
AVI_READ2BYTES
(
p_chk
->
strf
.
auds
.
p_wf
->
nChannels
);
...
...
@@ -561,6 +562,7 @@ static int AVI_ChunkRead_strf( input_thread_t *p_input,
break
;
case
(
AVIFOURCC_vids
):
p_strh
->
strh
.
i_samplesize
=
0
;
// XXX for ffmpeg avi file
p_chk
->
strf
.
vids
.
i_cat
=
VIDEO_ES
;
p_chk
->
strf
.
vids
.
p_bih
=
malloc
(
p_chk
->
common
.
i_chunk_size
);
AVI_READ4BYTES
(
p_chk
->
strf
.
vids
.
p_bih
->
biSize
);
AVI_READ4BYTES
(
p_chk
->
strf
.
vids
.
p_bih
->
biWidth
);
...
...
@@ -597,6 +599,7 @@ static int AVI_ChunkRead_strf( input_thread_t *p_input,
break
;
default:
msg_Warn
(
p_input
,
"unknown stream type"
);
p_chk
->
strf
.
common
.
i_cat
=
UNKNOWN_ES
;
break
;
}
AVI_READCHUNK_EXIT
(
VLC_SUCCESS
);
...
...
@@ -604,7 +607,18 @@ static int AVI_ChunkRead_strf( input_thread_t *p_input,
static
void
AVI_ChunkFree_strf
(
input_thread_t
*
p_input
,
avi_chunk_t
*
p_chk
)
{
avi_chunk_strf_t
*
p_strf
=
(
avi_chunk_strf_t
*
)
p_chk
;
switch
(
p_strf
->
common
.
i_cat
)
{
case
AUDIO_ES
:
FREE
(
p_strf
->
auds
.
p_wf
);
break
;
case
VIDEO_ES
:
FREE
(
p_strf
->
vids
.
p_bih
);
break
;
default:
break
;
}
}
static
int
AVI_ChunkRead_strd
(
input_thread_t
*
p_input
,
...
...
modules/demux/avi/libavi.h
View file @
22d851e1
...
...
@@ -2,7 +2,7 @@
* libavi.h : LibAVI library
******************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libavi.h,v 1.
6 2002/12/06 16:34:06 sam
Exp $
* $Id: libavi.h,v 1.
7 2003/01/25 16:58:34 fenrir
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -237,12 +237,14 @@ typedef struct avi_chunk_strh_s
typedef
struct
avi_chunk_strf_auds_s
{
AVI_CHUNK_COMMON
int
i_cat
;
WAVEFORMATEX
*
p_wf
;
}
avi_chunk_strf_auds_t
;
typedef
struct
avi_chunk_strf_vids_s
{
AVI_CHUNK_COMMON
int
i_cat
;
BITMAPINFOHEADER
*
p_bih
;
}
avi_chunk_strf_vids_t
;
...
...
@@ -250,6 +252,11 @@ typedef union avi_chunk_strf_u
{
avi_chunk_strf_auds_t
auds
;
avi_chunk_strf_vids_t
vids
;
struct
{
AVI_CHUNK_COMMON
int
i_cat
;
}
common
;
}
avi_chunk_strf_t
;
typedef
struct
avi_chunk_strd_s
...
...
modules/demux/demuxdump.c
View file @
22d851e1
...
...
@@ -2,7 +2,7 @@
* demuxdump.c : Pseudo demux module for vlc (dump raw stream)
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: demuxdump.c,v 1.
2 2002/12/18 14:17:10 sam
Exp $
* $Id: demuxdump.c,v 1.
3 2003/01/25 16:58:34 fenrir
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -113,7 +113,7 @@ static int Activate( vlc_object_t * p_this )
psz_name
);
p_demux
->
psz_name
=
psz_name
;
}
p_demux
->
i_write
=
0
;
p_demux
->
p_demux_data_sav
=
p_input
->
p_demux_data
;
...
...
@@ -124,7 +124,7 @@ static int Activate( vlc_object_t * p_this )
}
else
{
if
(
input_InitStream
(
p_input
,
0
)
==
-
1
)
{
fclose
(
p_demux
->
p_file
);
...
...
@@ -133,7 +133,7 @@ static int Activate( vlc_object_t * p_this )
}
input_AddProgram
(
p_input
,
0
,
0
);
p_input
->
stream
.
p_selected_program
=
p_input
->
stream
.
pp_programs
[
0
];
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
p_input
->
stream
.
p_selected_area
->
i_tell
=
0
;
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_lock
);
...
...
@@ -155,12 +155,12 @@ static void Desactivate ( 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
;
msg_Info
(
p_input
,
"closing %s ("
I64Fd
" Kbytes dumped)"
,
msg_Info
(
p_input
,
"closing %s ("
I64Fd
" Kbytes dumped)"
,
p_demux
->
psz_name
,
p_demux
->
i_write
/
1024
);
if
(
p_demux
->
p_file
)
{
fclose
(
p_demux
->
p_file
);
...
...
@@ -168,7 +168,7 @@ static void Desactivate ( vlc_object_t *p_this )
}
if
(
p_demux
->
psz_name
)
{
free
(
p_demux
->
psz_name
);
free
(
p_demux
->
psz_name
);
}
p_input
->
p_demux_data
=
p_demux
->
p_demux_data_sav
;
free
(
p_demux
);
...
...
modules/demux/mp4/libmp4.c
View file @
22d851e1
...
...
@@ -2,14 +2,14 @@
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libmp4.c,v 1.1
2 2003/01/13 02:30:11
fenrir Exp $
* $Id: libmp4.c,v 1.1
3 2003/01/25 16:58:34
fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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
...
...
@@ -35,8 +35,8 @@
#include "libmp4.h"
/*****************************************************************************
* Here are defined some macro to make life simpler but before using it
* *look* at the code.
* Here are defined some macro to make life simpler but before using it
* *look* at the code.
*
* XXX: All macro are written in capital letters
*
...
...
@@ -44,7 +44,7 @@
#define MP4_BOX_HEADERSIZE( p_box ) \
( 8 + ( p_box->i_shortsize == 1 ? 8 : 0 ) \
+ ( p_box->i_type == FOURCC_uuid ? 16 : 0 ) )
#define MP4_BOX_DESCEND( p_box ) \
MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) )
...
...
@@ -59,18 +59,18 @@
#define MP4_GET4BYTES( dst ) \
dst = GetDWBE( p_peek ); p_peek += 4; i_read -= 4
#define MP4_GETFOURCC( dst ) \
dst = VLC_FOURCC( p_peek[0], p_peek[1], p_peek[2], p_peek[3] ); \
p_peek += 4; i_read -= 4
#define MP4_GET8BYTES( dst ) \
dst = GetQWBE( p_peek ); p_peek += 8; i_read -= 8
#define MP4_GETVERSIONFLAGS( p_void ) \
MP4_GET1BYTE( p_void->i_version ); \
MP4_GET3BYTES( p_void->i_flags )
#define MP4_GETSTRINGZ( p_str ) \
if( ( i_read > 0 )&&(p_peek[0] ) ) \
{ \
...
...
@@ -84,7 +84,7 @@
{ \
p_str = NULL; \
}
#define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t ) \
int64_t i_read = p_box->i_size; \
...
...
@@ -105,8 +105,8 @@
{ \
free( p_buff ); \
return( 0 ); \
}
}
#define MP4_READBOX_EXIT( i_code ) \
free( p_buff ); \
if( i_read < 0 ) \
...
...
@@ -117,12 +117,12 @@
#define FREE( p ) \
if( p ) {free( p ); p = NULL; }
/* Some assumptions:
* The input method HAVE to be seekable
* The input method HAVE to be seekable
*/
/* Some functions to manipulate memory */
...
...
@@ -187,7 +187,7 @@ void MP4_ConvertDate2Str( char *psz, uint64_t i_date )
i_hour
=
(
i_date
/
(
60
*
60
)
)
%
60
;
i_min
=
(
i_date
/
60
)
%
60
;
i_sec
=
i_date
%
60
;
/* FIXME do it correctly, date begin at 1 jan 1904 */
/* FIXME do it correctly, date begin at 1 jan 1904 */
sprintf
(
psz
,
"%dd-%2.2dh:%2.2dm:%2.2ds"
,
i_day
,
i_hour
,
i_min
,
i_sec
);
}
...
...
@@ -198,7 +198,7 @@ void MP4_ConvertDate2Str( char *psz, uint64_t i_date )
* Some basic functions to manipulate stream more easily in vlc
*
* MP4_TellAbsolute get file position