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
04a75bb7
Commit
04a75bb7
authored
Mar 10, 2013
by
Ronald S. Bultje
Committed by
Michael Niedermayer
Mar 13, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
interplayvideo: use hpeldsp instead of dsputil for half-pel functions.
This makes interplayvideo independent of dsputil.
parent
af1e3dfb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
configure
configure
+1
-1
interplayvideo.c
libavcodec/interplayvideo.c
+5
-5
No files found.
configure
View file @
04a75bb7
...
...
@@ -1741,7 +1741,7 @@ huffyuv_encoder_select="huffman"
iac_decoder_select
=
"fft mdct sinewin"
imc_decoder_select
=
"dsputil fft mdct sinewin"
indeo3_decoder_select
=
"hpeldsp"
interplay
video_decoder_select
=
"dsputil
"
interplay
_video_decoder_select
=
"hpeldsp
"
jpegls_decoder_select
=
"golomb"
jpegls_encoder_select
=
"golomb"
jv_decoder_select
=
"dsputil"
...
...
libavcodec/interplayvideo.c
View file @
04a75bb7
...
...
@@ -40,7 +40,7 @@
#include "avcodec.h"
#include "bytestream.h"
#include "
dsputil
.h"
#include "
hpeldsp
.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "internal.h"
...
...
@@ -50,7 +50,7 @@
typedef
struct
IpvideoContext
{
AVCodecContext
*
avctx
;
DSPContext
dsp
;
HpelDSPContext
h
dsp
;
AVFrame
*
second_last_frame
;
AVFrame
*
last_frame
;
const
unsigned
char
*
decoding_map
;
...
...
@@ -83,8 +83,8 @@ static int copy_from(IpvideoContext *s, AVFrame *src, AVFrame *dst, int delta_x,
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Invalid decode type, corrupted header?
\n
"
);
return
AVERROR
(
EINVAL
);
}
s
->
dsp
.
put_pixels_tab
[
!
s
->
is_16bpp
][
0
](
s
->
pixel_ptr
,
src
->
data
[
0
]
+
motion_offset
,
dst
->
linesize
[
0
],
8
);
s
->
h
dsp
.
put_pixels_tab
[
!
s
->
is_16bpp
][
0
](
s
->
pixel_ptr
,
src
->
data
[
0
]
+
motion_offset
,
dst
->
linesize
[
0
],
8
);
return
0
;
}
...
...
@@ -939,7 +939,7 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx)
s
->
is_16bpp
=
avctx
->
bits_per_coded_sample
==
16
;
avctx
->
pix_fmt
=
s
->
is_16bpp
?
AV_PIX_FMT_RGB555
:
AV_PIX_FMT_PAL8
;
ff_
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_
hpeldsp_init
(
&
s
->
hdsp
,
avctx
->
flags
);
s
->
last_frame
=
av_frame_alloc
();
s
->
second_last_frame
=
av_frame_alloc
();
...
...
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