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
2ff4954e
Commit
2ff4954e
authored
Sep 30, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OMX: rename GetVlcAudioFormat to OmxToVlcAudioFormat
parent
7ad0c654
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
modules/codec/omxil/omxil.c
modules/codec/omxil/omxil.c
+2
-2
modules/codec/omxil/omxil_utils.h
modules/codec/omxil/omxil_utils.h
+1
-1
modules/codec/omxil/utils.c
modules/codec/omxil/utils.c
+2
-2
No files found.
modules/codec/omxil/omxil.c
View file @
2ff4954e
...
@@ -338,7 +338,7 @@ static OMX_ERRORTYPE SetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
...
@@ -338,7 +338,7 @@ static OMX_ERRORTYPE SetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
}
}
else
else
{
{
if
(
!
Get
VlcAudioFormat
(
def
->
format
.
audio
.
eEncoding
,
if
(
!
OmxTo
VlcAudioFormat
(
def
->
format
.
audio
.
eEncoding
,
&
p_fmt
->
i_codec
,
0
)
)
&
p_fmt
->
i_codec
,
0
)
)
{
{
omx_error
=
OMX_ErrorNotImplemented
;
omx_error
=
OMX_ErrorNotImplemented
;
...
@@ -448,7 +448,7 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
...
@@ -448,7 +448,7 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
break
;
break
;
case
AUDIO_ES
:
case
AUDIO_ES
:
if
(
!
Get
VlcAudioFormat
(
def
->
format
.
audio
.
eEncoding
,
if
(
!
OmxTo
VlcAudioFormat
(
def
->
format
.
audio
.
eEncoding
,
&
p_fmt
->
i_codec
,
0
)
)
&
p_fmt
->
i_codec
,
0
)
)
{
{
omx_error
=
OMX_ErrorNotImplemented
;
omx_error
=
OMX_ErrorNotImplemented
;
...
...
modules/codec/omxil/omxil_utils.h
View file @
2ff4954e
...
@@ -155,7 +155,7 @@ int GetVlcVideoFormat( OMX_VIDEO_CODINGTYPE i_omx_codec,
...
@@ -155,7 +155,7 @@ int GetVlcVideoFormat( OMX_VIDEO_CODINGTYPE i_omx_codec,
int
GetOmxAudioFormat
(
vlc_fourcc_t
i_fourcc
,
int
GetOmxAudioFormat
(
vlc_fourcc_t
i_fourcc
,
OMX_AUDIO_CODINGTYPE
*
pi_omx_codec
,
OMX_AUDIO_CODINGTYPE
*
pi_omx_codec
,
const
char
**
ppsz_name
);
const
char
**
ppsz_name
);
int
Get
VlcAudioFormat
(
OMX_AUDIO_CODINGTYPE
i_omx_codec
,
int
OmxTo
VlcAudioFormat
(
OMX_AUDIO_CODINGTYPE
i_omx_codec
,
vlc_fourcc_t
*
pi_fourcc
,
const
char
**
ppsz_name
);
vlc_fourcc_t
*
pi_fourcc
,
const
char
**
ppsz_name
);
const
char
*
GetOmxRole
(
vlc_fourcc_t
i_fourcc
,
int
i_cat
,
bool
b_enc
);
const
char
*
GetOmxRole
(
vlc_fourcc_t
i_fourcc
,
int
i_cat
,
bool
b_enc
);
int
GetOmxChromaFormat
(
vlc_fourcc_t
i_fourcc
,
int
GetOmxChromaFormat
(
vlc_fourcc_t
i_fourcc
,
...
...
modules/codec/omxil/utils.c
View file @
2ff4954e
...
@@ -426,7 +426,7 @@ int GetOmxAudioFormat( vlc_fourcc_t i_fourcc,
...
@@ -426,7 +426,7 @@ int GetOmxAudioFormat( vlc_fourcc_t i_fourcc,
return
!!
audio_format_table
[
i
].
i_codec
;
return
!!
audio_format_table
[
i
].
i_codec
;
}
}
int
Get
VlcAudioFormat
(
OMX_AUDIO_CODINGTYPE
i_omx_codec
,
int
OmxTo
VlcAudioFormat
(
OMX_AUDIO_CODINGTYPE
i_omx_codec
,
vlc_fourcc_t
*
pi_fourcc
,
const
char
**
ppsz_name
)
vlc_fourcc_t
*
pi_fourcc
,
const
char
**
ppsz_name
)
{
{
unsigned
int
i
;
unsigned
int
i
;
...
@@ -875,7 +875,7 @@ void PrintOmx(decoder_t *p_dec, OMX_HANDLETYPE omx_handle, OMX_U32 i_port)
...
@@ -875,7 +875,7 @@ void PrintOmx(decoder_t *p_dec, OMX_HANDLETYPE omx_handle, OMX_U32 i_port)
case
OMX_PortDomainAudio
:
case
OMX_PortDomainAudio
:
Get
VlcAudioFormat
(
definition
.
format
.
audio
.
eEncoding
,
OmxTo
VlcAudioFormat
(
definition
.
format
.
audio
.
eEncoding
,
&
i_fourcc
,
&
psz_name
);
&
i_fourcc
,
&
psz_name
);
GetAudioParameters
(
omx_handle
,
&
format_param
,
GetAudioParameters
(
omx_handle
,
&
format_param
,
...
...
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