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
4b642ab1
Commit
4b642ab1
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
indeo3: use hpeldsp instead of dsputil for half-pel functions.
This makes indeo3 independent of dsputil.
parent
704c9874
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
configure
configure
+1
-1
indeo3.c
libavcodec/indeo3.c
+5
-5
No files found.
configure
View file @
4b642ab1
...
@@ -1740,7 +1740,7 @@ huffyuv_decoder_select="dsputil"
...
@@ -1740,7 +1740,7 @@ huffyuv_decoder_select="dsputil"
huffyuv_encoder_select
=
"huffman"
huffyuv_encoder_select
=
"huffman"
iac_decoder_select
=
"fft mdct sinewin"
iac_decoder_select
=
"fft mdct sinewin"
imc_decoder_select
=
"dsputil fft mdct sinewin"
imc_decoder_select
=
"dsputil fft mdct sinewin"
indeo3_decoder_select
=
"
dsputil
"
indeo3_decoder_select
=
"
hpeldsp
"
interplayvideo_decoder_select
=
"dsputil"
interplayvideo_decoder_select
=
"dsputil"
jpegls_decoder_select
=
"golomb"
jpegls_decoder_select
=
"golomb"
jpegls_encoder_select
=
"golomb"
jpegls_encoder_select
=
"golomb"
...
...
libavcodec/indeo3.c
View file @
4b642ab1
...
@@ -33,9 +33,9 @@
...
@@ -33,9 +33,9 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "avcodec.h"
#include "copy_block.h"
#include "copy_block.h"
#include "dsputil.h"
#include "bytestream.h"
#include "bytestream.h"
#include "get_bits.h"
#include "get_bits.h"
#include "hpeldsp.h"
#include "internal.h"
#include "internal.h"
#include "indeo3data.h"
#include "indeo3data.h"
...
@@ -82,7 +82,7 @@ typedef struct Cell {
...
@@ -82,7 +82,7 @@ typedef struct Cell {
typedef
struct
Indeo3DecodeContext
{
typedef
struct
Indeo3DecodeContext
{
AVCodecContext
*
avctx
;
AVCodecContext
*
avctx
;
DSPContext
dsp
;
HpelDSPContext
h
dsp
;
GetBitContext
gb
;
GetBitContext
gb
;
int
need_resync
;
int
need_resync
;
...
@@ -248,12 +248,12 @@ static void copy_cell(Indeo3DecodeContext *ctx, Plane *plane, Cell *cell)
...
@@ -248,12 +248,12 @@ static void copy_cell(Indeo3DecodeContext *ctx, Plane *plane, Cell *cell)
/* copy using 16xH blocks */
/* copy using 16xH blocks */
if
(
!
((
cell
->
xpos
<<
2
)
&
15
)
&&
w
>=
4
)
{
if
(
!
((
cell
->
xpos
<<
2
)
&
15
)
&&
w
>=
4
)
{
for
(;
w
>=
4
;
src
+=
16
,
dst
+=
16
,
w
-=
4
)
for
(;
w
>=
4
;
src
+=
16
,
dst
+=
16
,
w
-=
4
)
ctx
->
dsp
.
put_no_rnd_pixels_tab
[
0
][
0
](
dst
,
src
,
plane
->
pitch
,
h
);
ctx
->
h
dsp
.
put_no_rnd_pixels_tab
[
0
][
0
](
dst
,
src
,
plane
->
pitch
,
h
);
}
}
/* copy using 8xH blocks */
/* copy using 8xH blocks */
if
(
!
((
cell
->
xpos
<<
2
)
&
7
)
&&
w
>=
2
)
{
if
(
!
((
cell
->
xpos
<<
2
)
&
7
)
&&
w
>=
2
)
{
ctx
->
dsp
.
put_no_rnd_pixels_tab
[
1
][
0
](
dst
,
src
,
plane
->
pitch
,
h
);
ctx
->
h
dsp
.
put_no_rnd_pixels_tab
[
1
][
0
](
dst
,
src
,
plane
->
pitch
,
h
);
w
-=
2
;
w
-=
2
;
src
+=
8
;
src
+=
8
;
dst
+=
8
;
dst
+=
8
;
...
@@ -1050,7 +1050,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
...
@@ -1050,7 +1050,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
build_requant_tab
();
build_requant_tab
();
ff_
dsputil_init
(
&
ctx
->
dsp
,
avctx
);
ff_
hpeldsp_init
(
&
ctx
->
hdsp
,
avctx
->
flags
);
return
allocate_frame_buffers
(
ctx
,
avctx
,
avctx
->
width
,
avctx
->
height
);
return
allocate_frame_buffers
(
ctx
,
avctx
,
avctx
->
width
,
avctx
->
height
);
}
}
...
...
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