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
e0a8f315
Commit
e0a8f315
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
mjpeg: use hpeldsp instead of dsputil for half-pel functions.
parent
b42d594c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
configure
configure
+1
-0
mjpegdec.c
libavcodec/mjpegdec.c
+2
-1
mjpegdec.h
libavcodec/mjpegdec.h
+2
-0
No files found.
configure
View file @
e0a8f315
...
@@ -1750,6 +1750,7 @@ ljpeg_encoder_select="aandcttables mpegvideoenc"
...
@@ -1750,6 +1750,7 @@ 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 hpeldsp"
mimic_decoder_select
=
"dsputil hpeldsp"
mjpeg_decoder_select
=
"dsputil hpeldsp"
mjpeg_encoder_select
=
"aandcttables dsputil mpegvideoenc"
mjpeg_encoder_select
=
"aandcttables dsputil mpegvideoenc"
mlp_decoder_select
=
"dsputil mlp_parser"
mlp_decoder_select
=
"dsputil mlp_parser"
motionpixels_decoder_select
=
"dsputil"
motionpixels_decoder_select
=
"dsputil"
...
...
libavcodec/mjpegdec.c
View file @
e0a8f315
...
@@ -89,6 +89,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
...
@@ -89,6 +89,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
avcodec_get_frame_defaults
(
&
s
->
picture
);
avcodec_get_frame_defaults
(
&
s
->
picture
);
s
->
avctx
=
avctx
;
s
->
avctx
=
avctx
;
ff_hpeldsp_init
(
&
s
->
hdsp
,
avctx
->
flags
);
ff_dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_init_scantable
(
s
->
dsp
.
idct_permutation
,
&
s
->
scantable
,
ff_zigzag_direct
);
ff_init_scantable
(
s
->
dsp
.
idct_permutation
,
&
s
->
scantable
,
ff_zigzag_direct
);
s
->
buffer_size
=
0
;
s
->
buffer_size
=
0
;
...
@@ -992,7 +993,7 @@ static av_always_inline void mjpeg_copy_block(MJpegDecodeContext *s,
...
@@ -992,7 +993,7 @@ static av_always_inline void mjpeg_copy_block(MJpegDecodeContext *s,
int
linesize
,
int
lowres
)
int
linesize
,
int
lowres
)
{
{
switch
(
lowres
)
{
switch
(
lowres
)
{
case
0
:
s
->
dsp
.
put_pixels_tab
[
1
][
0
](
dst
,
src
,
linesize
,
8
);
case
0
:
s
->
h
dsp
.
put_pixels_tab
[
1
][
0
](
dst
,
src
,
linesize
,
8
);
break
;
break
;
case
1
:
copy_block4
(
dst
,
src
,
linesize
,
linesize
,
4
);
case
1
:
copy_block4
(
dst
,
src
,
linesize
,
linesize
,
4
);
break
;
break
;
...
...
libavcodec/mjpegdec.h
View file @
e0a8f315
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
#include "avcodec.h"
#include "avcodec.h"
#include "get_bits.h"
#include "get_bits.h"
#include "dsputil.h"
#include "dsputil.h"
#include "hpeldsp.h"
#define MAX_COMPONENTS 4
#define MAX_COMPONENTS 4
...
@@ -97,6 +98,7 @@ typedef struct MJpegDecodeContext {
...
@@ -97,6 +98,7 @@ typedef struct MJpegDecodeContext {
uint64_t
coefs_finished
[
MAX_COMPONENTS
];
///< bitmask of which coefs have been completely decoded (progressive mode)
uint64_t
coefs_finished
[
MAX_COMPONENTS
];
///< bitmask of which coefs have been completely decoded (progressive mode)
ScanTable
scantable
;
ScanTable
scantable
;
DSPContext
dsp
;
DSPContext
dsp
;
HpelDSPContext
hdsp
;
int
restart_interval
;
int
restart_interval
;
int
restart_count
;
int
restart_count
;
...
...
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