Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
d615da60
Commit
d615da60
authored
Dec 29, 2012
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
snow: use VideoDSPContext
It was left over from the initial conversion.
parent
30a76487
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
snow.c
libavcodec/snow.c
+2
-1
snow.h
libavcodec/snow.h
+1
-0
No files found.
libavcodec/snow.c
View file @
d615da60
...
@@ -349,7 +349,7 @@ void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, int stride,
...
@@ -349,7 +349,7 @@ void ff_snow_pred_block(SnowContext *s, uint8_t *dst, uint8_t *tmp, int stride,
src
+=
sx
+
sy
*
stride
;
src
+=
sx
+
sy
*
stride
;
if
(
(
unsigned
)
sx
>=
w
-
b_w
-
(
HTAPS_MAX
-
2
)
if
(
(
unsigned
)
sx
>=
w
-
b_w
-
(
HTAPS_MAX
-
2
)
||
(
unsigned
)
sy
>=
h
-
b_h
-
(
HTAPS_MAX
-
2
)){
||
(
unsigned
)
sy
>=
h
-
b_h
-
(
HTAPS_MAX
-
2
)){
s
->
dsp
.
emulated_edge_mc
(
tmp
+
MB_SIZE
,
src
,
stride
,
b_w
+
HTAPS_MAX
-
1
,
b_h
+
HTAPS_MAX
-
1
,
sx
,
sy
,
w
,
h
);
s
->
v
dsp
.
emulated_edge_mc
(
tmp
+
MB_SIZE
,
src
,
stride
,
b_w
+
HTAPS_MAX
-
1
,
b_h
+
HTAPS_MAX
-
1
,
sx
,
sy
,
w
,
h
);
src
=
tmp
+
MB_SIZE
;
src
=
tmp
+
MB_SIZE
;
}
}
// assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
// assert(b_w == b_h || 2*b_w == b_h || b_w == 2*b_h);
...
@@ -402,6 +402,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
...
@@ -402,6 +402,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
s
->
max_ref_frames
=
1
;
//just make sure its not an invalid value in case of no initial keyframe
s
->
max_ref_frames
=
1
;
//just make sure its not an invalid value in case of no initial keyframe
ff_dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_videodsp_init
(
&
s
->
vdsp
,
8
);
ff_dwt_init
(
&
s
->
dwt
);
ff_dwt_init
(
&
s
->
dwt
);
#define mcf(dx,dy)\
#define mcf(dx,dy)\
...
...
libavcodec/snow.h
View file @
d615da60
...
@@ -108,6 +108,7 @@ typedef struct SnowContext{
...
@@ -108,6 +108,7 @@ typedef struct SnowContext{
AVCodecContext
*
avctx
;
AVCodecContext
*
avctx
;
RangeCoder
c
;
RangeCoder
c
;
DSPContext
dsp
;
DSPContext
dsp
;
VideoDSPContext
vdsp
;
DWTContext
dwt
;
DWTContext
dwt
;
AVFrame
new_picture
;
AVFrame
new_picture
;
AVFrame
input_picture
;
///< new_picture with the internal linesizes
AVFrame
input_picture
;
///< new_picture with the internal linesizes
...
...
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