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
771ba8f2
Commit
771ba8f2
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
snow: use hpeldsp instead of dsputil for half-pel functions.
parent
05dd5834
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
configure
configure
+2
-2
snow.c
libavcodec/snow.c
+5
-4
snow.h
libavcodec/snow.h
+2
-0
snowenc.c
libavcodec/snowenc.c
+2
-0
No files found.
configure
View file @
771ba8f2
...
@@ -1799,8 +1799,8 @@ rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvi
...
@@ -1799,8 +1799,8 @@ rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvi
rv40_decoder_select
=
"error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
rv40_decoder_select
=
"error_resilience golomb h264chroma h264pred h264qpel mpegvideo videodsp"
shorten_decoder_select
=
"golomb"
shorten_decoder_select
=
"golomb"
sipr_decoder_select
=
"lsp"
sipr_decoder_select
=
"lsp"
snow_decoder_select
=
"dsputil dwt h264qpel rangecoder"
snow_decoder_select
=
"dsputil dwt h264qpel
hpeldsp
rangecoder"
snow_encoder_select
=
"aandcttables dsputil dwt h264qpel error_resilience mpegvideoenc rangecoder"
snow_encoder_select
=
"aandcttables dsputil dwt h264qpel
hpeldsp
error_resilience mpegvideoenc rangecoder"
sonic_decoder_select
=
"golomb"
sonic_decoder_select
=
"golomb"
sonic_encoder_select
=
"golomb"
sonic_encoder_select
=
"golomb"
sonic_ls_encoder_select
=
"golomb"
sonic_ls_encoder_select
=
"golomb"
...
...
libavcodec/snow.c
View file @
771ba8f2
...
@@ -401,6 +401,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
...
@@ -401,6 +401,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
s
->
max_ref_frames
=
1
;
//just make sure it's not an invalid value in case of no initial keyframe
s
->
max_ref_frames
=
1
;
//just make sure it's not an invalid value in case of no initial keyframe
ff_dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_hpeldsp_init
(
&
s
->
hdsp
,
avctx
->
flags
);
ff_videodsp_init
(
&
s
->
vdsp
,
8
);
ff_videodsp_init
(
&
s
->
vdsp
,
8
);
ff_dwt_init
(
&
s
->
dwt
);
ff_dwt_init
(
&
s
->
dwt
);
ff_h264qpel_init
(
&
s
->
h264qpel
,
8
);
ff_h264qpel_init
(
&
s
->
h264qpel
,
8
);
...
@@ -431,11 +432,11 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
...
@@ -431,11 +432,11 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
mcf
(
12
,
12
)
mcf
(
12
,
12
)
#define mcfh(dx,dy)\
#define mcfh(dx,dy)\
s->dsp.put_pixels_tab [0][dy/4+dx/8]=\
s->
h
dsp.put_pixels_tab [0][dy/4+dx/8]=\
s->dsp.put_no_rnd_pixels_tab[0][dy/4+dx/8]=\
s->
h
dsp.put_no_rnd_pixels_tab[0][dy/4+dx/8]=\
mc_block_hpel ## dx ## dy ## 16;\
mc_block_hpel ## dx ## dy ## 16;\
s->dsp.put_pixels_tab [1][dy/4+dx/8]=\
s->
h
dsp.put_pixels_tab [1][dy/4+dx/8]=\
s->dsp.put_no_rnd_pixels_tab[1][dy/4+dx/8]=\
s->
h
dsp.put_no_rnd_pixels_tab[1][dy/4+dx/8]=\
mc_block_hpel ## dx ## dy ## 8;
mc_block_hpel ## dx ## dy ## 8;
mcfh
(
0
,
0
)
mcfh
(
0
,
0
)
...
...
libavcodec/snow.h
View file @
771ba8f2
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
#define AVCODEC_SNOW_H
#define AVCODEC_SNOW_H
#include "dsputil.h"
#include "dsputil.h"
#include "hpeldsp.h"
#include "snow_dwt.h"
#include "snow_dwt.h"
#include "rangecoder.h"
#include "rangecoder.h"
...
@@ -109,6 +110,7 @@ typedef struct SnowContext{
...
@@ -109,6 +110,7 @@ typedef struct SnowContext{
AVCodecContext
*
avctx
;
AVCodecContext
*
avctx
;
RangeCoder
c
;
RangeCoder
c
;
DSPContext
dsp
;
DSPContext
dsp
;
HpelDSPContext
hdsp
;
VideoDSPContext
vdsp
;
VideoDSPContext
vdsp
;
H264QpelContext
h264qpel
;
H264QpelContext
h264qpel
;
SnowDWTContext
dwt
;
SnowDWTContext
dwt
;
...
...
libavcodec/snowenc.c
View file @
771ba8f2
...
@@ -1748,7 +1748,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -1748,7 +1748,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s
->
lambda2
=
s
->
m
.
lambda2
=
(
s
->
m
.
lambda
*
s
->
m
.
lambda
+
FF_LAMBDA_SCALE
/
2
)
>>
FF_LAMBDA_SHIFT
;
s
->
lambda2
=
s
->
m
.
lambda2
=
(
s
->
m
.
lambda
*
s
->
m
.
lambda
+
FF_LAMBDA_SCALE
/
2
)
>>
FF_LAMBDA_SHIFT
;
s
->
m
.
dsp
=
s
->
dsp
;
//move
s
->
m
.
dsp
=
s
->
dsp
;
//move
s
->
m
.
hdsp
=
s
->
hdsp
;
ff_init_me
(
&
s
->
m
);
ff_init_me
(
&
s
->
m
);
s
->
hdsp
=
s
->
m
.
hdsp
;
s
->
dsp
=
s
->
m
.
dsp
;
s
->
dsp
=
s
->
m
.
dsp
;
}
}
...
...
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