Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
19cf7163
Commit
19cf7163
authored
Aug 01, 2012
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
parent
faa78822
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
dca.c
libavcodec/dca.c
+1
-1
dca.h
libavcodec/dca.h
+1
-1
dca_parser.c
libavcodec/dca_parser.c
+1
-1
dcadec.c
libavcodec/dcadec.c
+1
-1
spdifenc.c
libavformat/spdifenc.c
+1
-1
No files found.
libavcodec/dca.c
View file @
19cf7163
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include "dca.h"
#include "dca.h"
const
uint32_t
ff
_dca_sample_rates
[
16
]
=
const
uint32_t
avpriv
_dca_sample_rates
[
16
]
=
{
{
0
,
8000
,
16000
,
32000
,
0
,
0
,
11025
,
22050
,
44100
,
0
,
0
,
0
,
8000
,
16000
,
32000
,
0
,
0
,
11025
,
22050
,
44100
,
0
,
0
,
12000
,
24000
,
48000
,
96000
,
192000
12000
,
24000
,
48000
,
96000
,
192000
...
...
libavcodec/dca.h
View file @
19cf7163
...
@@ -36,6 +36,6 @@
...
@@ -36,6 +36,6 @@
/** DCA-HD specific block starts with this marker. */
/** DCA-HD specific block starts with this marker. */
#define DCA_HD_MARKER 0x64582025
#define DCA_HD_MARKER 0x64582025
extern
const
uint32_t
ff
_dca_sample_rates
[
16
];
extern
const
uint32_t
avpriv
_dca_sample_rates
[
16
];
#endif
/* AVCODEC_DCA_H */
#endif
/* AVCODEC_DCA_H */
libavcodec/dca_parser.c
View file @
19cf7163
...
@@ -161,7 +161,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
...
@@ -161,7 +161,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
skip_bits
(
&
gb
,
20
);
skip_bits
(
&
gb
,
20
);
sr_code
=
get_bits
(
&
gb
,
4
);
sr_code
=
get_bits
(
&
gb
,
4
);
*
sample_rate
=
ff
_dca_sample_rates
[
sr_code
];
*
sample_rate
=
avpriv
_dca_sample_rates
[
sr_code
];
if
(
*
sample_rate
==
0
)
if
(
*
sample_rate
==
0
)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
...
...
libavcodec/dcadec.c
View file @
19cf7163
...
@@ -561,7 +561,7 @@ static int dca_parse_frame_header(DCAContext *s)
...
@@ -561,7 +561,7 @@ static int dca_parse_frame_header(DCAContext *s)
if
(
s
->
frame_size
<
95
)
if
(
s
->
frame_size
<
95
)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
s
->
amode
=
get_bits
(
&
s
->
gb
,
6
);
s
->
amode
=
get_bits
(
&
s
->
gb
,
6
);
s
->
sample_rate
=
ff
_dca_sample_rates
[
get_bits
(
&
s
->
gb
,
4
)];
s
->
sample_rate
=
avpriv
_dca_sample_rates
[
get_bits
(
&
s
->
gb
,
4
)];
if
(
!
s
->
sample_rate
)
if
(
!
s
->
sample_rate
)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
s
->
bit_rate_index
=
get_bits
(
&
s
->
gb
,
5
);
s
->
bit_rate_index
=
get_bits
(
&
s
->
gb
,
5
);
...
...
libavformat/spdifenc.c
View file @
19cf7163
...
@@ -252,7 +252,7 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt)
...
@@ -252,7 +252,7 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt)
case
DCA_MARKER_RAW_BE
:
case
DCA_MARKER_RAW_BE
:
blocks
=
(
AV_RB16
(
pkt
->
data
+
4
)
>>
2
)
&
0x7f
;
blocks
=
(
AV_RB16
(
pkt
->
data
+
4
)
>>
2
)
&
0x7f
;
core_size
=
((
AV_RB24
(
pkt
->
data
+
5
)
>>
4
)
&
0x3fff
)
+
1
;
core_size
=
((
AV_RB24
(
pkt
->
data
+
5
)
>>
4
)
&
0x3fff
)
+
1
;
sample_rate
=
ff
_dca_sample_rates
[(
pkt
->
data
[
8
]
>>
2
)
&
0x0f
];
sample_rate
=
avpriv
_dca_sample_rates
[(
pkt
->
data
[
8
]
>>
2
)
&
0x0f
];
break
;
break
;
case
DCA_MARKER_RAW_LE
:
case
DCA_MARKER_RAW_LE
:
blocks
=
(
AV_RL16
(
pkt
->
data
+
4
)
>>
2
)
&
0x7f
;
blocks
=
(
AV_RL16
(
pkt
->
data
+
4
)
>>
2
)
&
0x7f
;
...
...
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