Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
26b038f3
Commit
26b038f3
authored
Aug 06, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout_Format(s)Print: use vlc_object rather than audio_output
parent
7d6f5894
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
13 deletions
+21
-13
include/vlc_aout.h
include/vlc_aout.h
+3
-1
src/audio_output/aout_internal.h
src/audio_output/aout_internal.h
+5
-1
src/audio_output/common.c
src/audio_output/common.c
+13
-11
No files found.
include/vlc_aout.h
View file @
26b038f3
...
...
@@ -234,7 +234,9 @@ static inline unsigned aout_FormatNbChannels(const audio_sample_format_t *fmt)
VLC_API
unsigned
int
aout_BitsPerSample
(
vlc_fourcc_t
i_format
)
VLC_USED
;
VLC_API
void
aout_FormatPrepare
(
audio_sample_format_t
*
p_format
);
VLC_API
void
aout_FormatPrint
(
audio_output_t
*
p_aout
,
const
char
*
psz_text
,
const
audio_sample_format_t
*
p_format
);
VLC_API
void
aout_FormatPrint
(
vlc_object_t
*
,
const
char
*
,
const
audio_sample_format_t
*
);
#define aout_FormatPrint(o, t, f) aout_FormatPrint(VLC_OBJECT(o), t, f)
VLC_API
const
char
*
aout_FormatPrintChannels
(
const
audio_sample_format_t
*
)
VLC_USED
;
VLC_API
void
aout_VolumeNoneInit
(
audio_output_t
*
);
...
...
src/audio_output/aout_internal.h
View file @
26b038f3
...
...
@@ -168,7 +168,11 @@ aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo ) VLC_USED;
void
aout_FifoReset
(
aout_fifo_t
*
);
void
aout_FifoMoveDates
(
aout_fifo_t
*
,
mtime_t
);
void
aout_FifoDestroy
(
aout_fifo_t
*
p_fifo
);
void
aout_FormatsPrint
(
audio_output_t
*
p_aout
,
const
char
*
psz_text
,
const
audio_sample_format_t
*
p_format1
,
const
audio_sample_format_t
*
p_format2
);
void
aout_FormatsPrint
(
vlc_object_t
*
,
const
char
*
,
const
audio_sample_format_t
*
,
const
audio_sample_format_t
*
);
#define aout_FormatsPrint(o, t, a, b) \
aout_FormatsPrint(VLC_OBJECT(o), t, a, b)
bool
aout_ChangeFilterString
(
vlc_object_t
*
,
audio_output_t
*
,
const
char
*
psz_variable
,
const
char
*
psz_name
,
bool
b_add
);
/* From dec.c */
...
...
src/audio_output/common.c
View file @
26b038f3
...
...
@@ -290,26 +290,28 @@ const char * aout_FormatPrintChannels( const audio_sample_format_t * p_format )
return
"ERROR"
;
}
/*****************************************************************************
* aout_FormatPrint : print a format in a human-readable form
*****************************************************************************/
void
aout_FormatPrint
(
audio_output_t
*
p_aout
,
const
char
*
psz_text
,
const
audio_sample_format_t
*
p_format
)
#undef aout_FormatPrint
/**
* Prints an audio sample format in a human-readable form.
*/
void
aout_FormatPrint
(
vlc_object_t
*
obj
,
const
char
*
psz_text
,
const
audio_sample_format_t
*
p_format
)
{
msg_Dbg
(
p_aout
,
"%s '%4.4s' %d Hz %s frame=%d samples/%d bytes"
,
psz_text
,
msg_Dbg
(
obj
,
"%s '%4.4s' %d Hz %s frame=%d samples/%d bytes"
,
psz_text
,
(
char
*
)
&
p_format
->
i_format
,
p_format
->
i_rate
,
aout_FormatPrintChannels
(
p_format
),
p_format
->
i_frame_length
,
p_format
->
i_bytes_per_frame
);
}
/*****************************************************************************
* aout_FormatsPrint : print two formats in a human-readable form
*****************************************************************************/
void
aout_FormatsPrint
(
audio_output_t
*
p_aout
,
const
char
*
psz_text
,
#undef aout_FormatsPrint
/**
* Prints two formats in a human-readable form
*/
void
aout_FormatsPrint
(
vlc_object_t
*
obj
,
const
char
*
psz_text
,
const
audio_sample_format_t
*
p_format1
,
const
audio_sample_format_t
*
p_format2
)
{
msg_Dbg
(
p_aout
,
"%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s"
,
msg_Dbg
(
obj
,
"%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s"
,
psz_text
,
(
char
*
)
&
p_format1
->
i_format
,
(
char
*
)
&
p_format2
->
i_format
,
p_format1
->
i_rate
,
p_format2
->
i_rate
,
...
...
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