Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
c1047003
Commit
c1047003
authored
12 years ago
by
Ronald S. Bultje
Committed by
Martin Storsjö
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mimic: Use hpeldsp instead of dsputil for half-pel functions
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
8071264f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+1
-1
1 addition, 1 deletion
configure
libavcodec/mimic.c
+5
-2
5 additions, 2 deletions
libavcodec/mimic.c
with
6 additions
and
3 deletions
configure
+
1
−
1
View file @
c1047003
...
@@ -1587,7 +1587,7 @@ lagarith_decoder_select="dsputil"
...
@@ -1587,7 +1587,7 @@ lagarith_decoder_select="dsputil"
ljpeg_encoder_select
=
"aandcttables mpegvideoenc"
ljpeg_encoder_select
=
"aandcttables mpegvideoenc"
loco_decoder_select
=
"golomb"
loco_decoder_select
=
"golomb"
mdec_decoder_select
=
"dsputil error_resilience mpegvideo"
mdec_decoder_select
=
"dsputil error_resilience mpegvideo"
mimic_decoder_select
=
"dsputil"
mimic_decoder_select
=
"dsputil
hpeldsp
"
mjpeg_decoder_select
=
"dsputil"
mjpeg_decoder_select
=
"dsputil"
mjpegb_decoder_select
=
"dsputil"
mjpegb_decoder_select
=
"dsputil"
mjpeg_encoder_select
=
"aandcttables dsputil mpegvideoenc"
mjpeg_encoder_select
=
"aandcttables dsputil mpegvideoenc"
...
...
This diff is collapsed.
Click to expand it.
libavcodec/mimic.c
+
5
−
2
View file @
c1047003
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
#include
"get_bits.h"
#include
"get_bits.h"
#include
"bytestream.h"
#include
"bytestream.h"
#include
"dsputil.h"
#include
"dsputil.h"
#include
"hpeldsp.h"
#include
"thread.h"
#include
"thread.h"
#define MIMIC_HEADER_SIZE 20
#define MIMIC_HEADER_SIZE 20
...
@@ -52,6 +53,7 @@ typedef struct {
...
@@ -52,6 +53,7 @@ typedef struct {
GetBitContext
gb
;
GetBitContext
gb
;
ScanTable
scantable
;
ScanTable
scantable
;
DSPContext
dsp
;
DSPContext
dsp
;
HpelDSPContext
hdsp
;
VLC
vlc
;
VLC
vlc
;
/* Kept in the context so multithreading can have a constant to read from */
/* Kept in the context so multithreading can have a constant to read from */
...
@@ -144,6 +146,7 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx)
...
@@ -144,6 +146,7 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx)
return
ret
;
return
ret
;
}
}
ff_dsputil_init
(
&
ctx
->
dsp
,
avctx
);
ff_dsputil_init
(
&
ctx
->
dsp
,
avctx
);
ff_hpeldsp_init
(
&
ctx
->
hdsp
,
avctx
->
flags
);
ff_init_scantable
(
ctx
->
dsp
.
idct_permutation
,
&
ctx
->
scantable
,
col_zag
);
ff_init_scantable
(
ctx
->
dsp
.
idct_permutation
,
&
ctx
->
scantable
,
col_zag
);
for
(
i
=
0
;
i
<
FF_ARRAY_ELEMS
(
ctx
->
frames
);
i
++
)
{
for
(
i
=
0
;
i
<
FF_ARRAY_ELEMS
(
ctx
->
frames
);
i
++
)
{
...
@@ -304,7 +307,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
...
@@ -304,7 +307,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
cur_row
,
0
);
cur_row
,
0
);
p
+=
src
-
p
+=
src
-
ctx
->
flipped_ptrs
[
ctx
->
prev_index
].
data
[
plane
];
ctx
->
flipped_ptrs
[
ctx
->
prev_index
].
data
[
plane
];
ctx
->
dsp
.
put_pixels_tab
[
1
][
0
](
dst
,
p
,
stride
,
8
);
ctx
->
h
dsp
.
put_pixels_tab
[
1
][
0
](
dst
,
p
,
stride
,
8
);
}
else
{
}
else
{
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
av_log
(
ctx
->
avctx
,
AV_LOG_ERROR
,
"No such backreference! Buggy sample.
\n
"
);
"No such backreference! Buggy sample.
\n
"
);
...
@@ -313,7 +316,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
...
@@ -313,7 +316,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
}
else
{
}
else
{
ff_thread_await_progress
(
&
ctx
->
frames
[
ctx
->
prev_index
],
ff_thread_await_progress
(
&
ctx
->
frames
[
ctx
->
prev_index
],
cur_row
,
0
);
cur_row
,
0
);
ctx
->
dsp
.
put_pixels_tab
[
1
][
0
](
dst
,
src
,
stride
,
8
);
ctx
->
h
dsp
.
put_pixels_tab
[
1
][
0
](
dst
,
src
,
stride
,
8
);
}
}
src
+=
8
;
src
+=
8
;
dst
+=
8
;
dst
+=
8
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment