Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
15b0517d
Commit
15b0517d
authored
Mar 22, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
svq3: make the dsp functions static
There is no need for them to be extern anymore.
parent
9b30f8dd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
39 deletions
+9
-39
svq3.c
libavcodec/svq3.c
+9
-12
svq3.h
libavcodec/svq3.h
+0
-27
No files found.
libavcodec/svq3.c
View file @
15b0517d
...
@@ -60,7 +60,6 @@
...
@@ -60,7 +60,6 @@
#endif
#endif
#include "svq1.h"
#include "svq1.h"
#include "svq3.h"
/**
/**
* @file
* @file
...
@@ -160,7 +159,7 @@ static const uint32_t svq3_dequant_coeff[32] = {
...
@@ -160,7 +159,7 @@ static const uint32_t svq3_dequant_coeff[32] = {
61694
,
68745
,
77615
,
89113
,
100253
,
109366
,
126635
,
141533
61694
,
68745
,
77615
,
89113
,
100253
,
109366
,
126635
,
141533
};
};
void
ff_
svq3_luma_dc_dequant_idct_c
(
int16_t
*
output
,
int16_t
*
input
,
int
qp
)
static
void
svq3_luma_dc_dequant_idct_c
(
int16_t
*
output
,
int16_t
*
input
,
int
qp
)
{
{
const
int
qmul
=
svq3_dequant_coeff
[
qp
];
const
int
qmul
=
svq3_dequant_coeff
[
qp
];
#define stride 16
#define stride 16
...
@@ -195,8 +194,8 @@ void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp)
...
@@ -195,8 +194,8 @@ void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp)
}
}
#undef stride
#undef stride
void
ff_
svq3_add_idct_c
(
uint8_t
*
dst
,
int16_t
*
block
,
static
void
svq3_add_idct_c
(
uint8_t
*
dst
,
int16_t
*
block
,
int
stride
,
int
qp
,
int
dc
)
int
stride
,
int
qp
,
int
dc
)
{
{
const
int
qmul
=
svq3_dequant_coeff
[
qp
];
const
int
qmul
=
svq3_dequant_coeff
[
qp
];
int
i
;
int
i
;
...
@@ -491,8 +490,8 @@ static av_always_inline void hl_decode_mb_idct_luma(const H264Context *h, H264Sl
...
@@ -491,8 +490,8 @@ static av_always_inline void hl_decode_mb_idct_luma(const H264Context *h, H264Sl
for
(
i
=
0
;
i
<
16
;
i
++
)
for
(
i
=
0
;
i
<
16
;
i
++
)
if
(
sl
->
non_zero_count_cache
[
scan8
[
i
]]
||
sl
->
mb
[
i
*
16
])
{
if
(
sl
->
non_zero_count_cache
[
scan8
[
i
]]
||
sl
->
mb
[
i
*
16
])
{
uint8_t
*
const
ptr
=
dest_y
+
block_offset
[
i
];
uint8_t
*
const
ptr
=
dest_y
+
block_offset
[
i
];
ff_
svq3_add_idct_c
(
ptr
,
sl
->
mb
+
i
*
16
,
linesize
,
svq3_add_idct_c
(
ptr
,
sl
->
mb
+
i
*
16
,
linesize
,
sl
->
qscale
,
IS_INTRA
(
mb_type
)
?
1
:
0
);
sl
->
qscale
,
IS_INTRA
(
mb_type
)
?
1
:
0
);
}
}
}
}
}
}
...
@@ -533,13 +532,12 @@ static av_always_inline void hl_decode_mb_predict_luma(const H264Context *h,
...
@@ -533,13 +532,12 @@ static av_always_inline void hl_decode_mb_predict_luma(const H264Context *h,
h
->
hpc
.
pred4x4
[
dir
](
ptr
,
topright
,
linesize
);
h
->
hpc
.
pred4x4
[
dir
](
ptr
,
topright
,
linesize
);
nnz
=
sl
->
non_zero_count_cache
[
scan8
[
i
]];
nnz
=
sl
->
non_zero_count_cache
[
scan8
[
i
]];
if
(
nnz
)
{
if
(
nnz
)
{
ff_
svq3_add_idct_c
(
ptr
,
sl
->
mb
+
i
*
16
,
linesize
,
qscale
,
0
);
svq3_add_idct_c
(
ptr
,
sl
->
mb
+
i
*
16
,
linesize
,
qscale
,
0
);
}
}
}
}
}
else
{
}
else
{
h
->
hpc
.
pred16x16
[
sl
->
intra16x16_pred_mode
](
dest_y
,
linesize
);
h
->
hpc
.
pred16x16
[
sl
->
intra16x16_pred_mode
](
dest_y
,
linesize
);
ff_svq3_luma_dc_dequant_idct_c
(
sl
->
mb
,
svq3_luma_dc_dequant_idct_c
(
sl
->
mb
,
sl
->
mb_luma_dc
[
0
],
qscale
);
sl
->
mb_luma_dc
[
0
],
qscale
);
}
}
}
}
...
@@ -586,9 +584,8 @@ static void hl_decode_mb(const H264Context *h, H264SliceContext *sl)
...
@@ -586,9 +584,8 @@ static void hl_decode_mb(const H264Context *h, H264SliceContext *sl)
for
(
i
=
j
*
16
;
i
<
j
*
16
+
4
;
i
++
)
for
(
i
=
j
*
16
;
i
<
j
*
16
+
4
;
i
++
)
if
(
sl
->
non_zero_count_cache
[
scan8
[
i
]]
||
sl
->
mb
[
i
*
16
])
{
if
(
sl
->
non_zero_count_cache
[
scan8
[
i
]]
||
sl
->
mb
[
i
*
16
])
{
uint8_t
*
const
ptr
=
dest
[
j
-
1
]
+
block_offset
[
i
];
uint8_t
*
const
ptr
=
dest
[
j
-
1
]
+
block_offset
[
i
];
ff_svq3_add_idct_c
(
ptr
,
sl
->
mb
+
i
*
16
,
svq3_add_idct_c
(
ptr
,
sl
->
mb
+
i
*
16
,
uvlinesize
,
uvlinesize
,
ff_h264_chroma_qp
[
0
][
sl
->
qscale
+
12
]
-
12
,
2
);
ff_h264_chroma_qp
[
0
][
sl
->
qscale
+
12
]
-
12
,
2
);
}
}
}
}
}
}
...
...
libavcodec/svq3.h
deleted
100644 → 0
View file @
9b30f8dd
/*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav 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 GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_SVQ3_H
#define AVCODEC_SVQ3_H
#include <stdint.h>
void
ff_svq3_luma_dc_dequant_idct_c
(
int16_t
*
output
,
int16_t
*
input
,
int
qp
);
void
ff_svq3_add_idct_c
(
uint8_t
*
dst
,
int16_t
*
block
,
int
stride
,
int
qp
,
int
dc
);
#endif
/* AVCODEC_SVQ3_H */
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