Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
4a3d7fbc
Commit
4a3d7fbc
authored
Oct 23, 2002
by
Michael Niedermayer
Browse files
fixing interlaced MC & edge-emu
Originally committed as revision 1066 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
8d0e42ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
libavcodec/h263dec.c
View file @
4a3d7fbc
...
...
@@ -327,6 +327,8 @@ uint64_t time= rdtsc();
return
0
;
}
retry:
if
(
s
->
bitstream_buffer_size
&&
buf_size
<
20
){
//divx 5.01+ frame reorder
init_get_bits
(
&
s
->
gb
,
s
->
bitstream_buffer
,
s
->
bitstream_buffer_size
);
}
else
...
...
@@ -431,8 +433,7 @@ uint64_t time= rdtsc();
avctx
->
aspected_height
=
s
->
aspected_height
;
}
if
(
MPV_common_init
(
s
)
<
0
)
return
-
1
;
goto
retry
;
}
if
((
s
->
codec_id
==
CODEC_ID_H263
||
s
->
codec_id
==
CODEC_ID_H263P
))
...
...
libavcodec/mpegvideo.c
View file @
4a3d7fbc
...
...
@@ -1283,8 +1283,9 @@ if(s->quarter_sample)
if
(
s
->
flags
&
CODEC_FLAG_EMU_EDGE
){
if
(
src_x
<
0
||
src_y
<
0
||
src_x
+
(
motion_x
&
1
)
+
16
>
s
->
h_edge_pos
||
src_y
+
(
motion_y
&
1
)
+
h
>
v_edge_pos
){
emulated_edge_mc
(
s
,
ptr
,
linesize
,
17
,
h
+
1
,
src_x
,
src_y
,
s
->
h_edge_pos
,
v_edge_pos
);
ptr
=
s
->
edge_emu_buffer
;
emulated_edge_mc
(
s
,
ptr
-
src_offset
,
s
->
linesize
,
17
,
17
+
field_based
,
src_x
,
src_y
<<
field_based
,
s
->
h_edge_pos
,
s
->
v_edge_pos
);
ptr
=
s
->
edge_emu_buffer
+
src_offset
;
emu
=
1
;
}
}
...
...
@@ -1319,15 +1320,17 @@ if(s->quarter_sample)
offset
=
(
src_y
*
uvlinesize
)
+
src_x
+
(
src_offset
>>
1
);
ptr
=
ref_picture
[
1
]
+
offset
;
if
(
emu
){
emulated_edge_mc
(
s
,
ptr
,
uvlinesize
,
9
,
(
h
>>
1
)
+
1
,
src_x
,
src_y
,
s
->
h_edge_pos
>>
1
,
v_edge_pos
>>
1
);
ptr
=
s
->
edge_emu_buffer
;
emulated_edge_mc
(
s
,
ptr
-
(
src_offset
>>
1
),
s
->
uvlinesize
,
9
,
9
+
field_based
,
src_x
,
src_y
<<
field_based
,
s
->
h_edge_pos
>>
1
,
s
->
v_edge_pos
>>
1
);
ptr
=
s
->
edge_emu_buffer
+
(
src_offset
>>
1
);
}
pix_op
[
1
][
dxy
](
dest_cb
+
(
dest_offset
>>
1
),
ptr
,
uvlinesize
,
h
>>
1
);
ptr
=
ref_picture
[
2
]
+
offset
;
if
(
emu
){
emulated_edge_mc
(
s
,
ptr
,
uvlinesize
,
9
,
(
h
>>
1
)
+
1
,
src_x
,
src_y
,
s
->
h_edge_pos
>>
1
,
v_edge_pos
>>
1
);
ptr
=
s
->
edge_emu_buffer
;
emulated_edge_mc
(
s
,
ptr
-
(
src_offset
>>
1
),
s
->
uvlinesize
,
9
,
9
+
field_based
,
src_x
,
src_y
<<
field_based
,
s
->
h_edge_pos
>>
1
,
s
->
v_edge_pos
>>
1
);
ptr
=
s
->
edge_emu_buffer
+
(
src_offset
>>
1
);
}
pix_op
[
1
][
dxy
](
dest_cr
+
(
dest_offset
>>
1
),
ptr
,
uvlinesize
,
h
>>
1
);
}
...
...
@@ -1365,8 +1368,9 @@ static inline void qpel_motion(MpegEncContext *s,
if
(
s
->
flags
&
CODEC_FLAG_EMU_EDGE
){
if
(
src_x
<
0
||
src_y
<
0
||
src_x
+
(
motion_x
&
3
)
+
16
>
s
->
h_edge_pos
||
src_y
+
(
motion_y
&
3
)
+
h
>
v_edge_pos
){
emulated_edge_mc
(
s
,
ptr
,
linesize
,
17
,
h
+
1
,
src_x
,
src_y
,
s
->
h_edge_pos
,
v_edge_pos
);
ptr
=
s
->
edge_emu_buffer
;
emulated_edge_mc
(
s
,
ptr
-
src_offset
,
s
->
linesize
,
17
,
17
+
field_based
,
src_x
,
src_y
<<
field_based
,
s
->
h_edge_pos
,
s
->
v_edge_pos
);
ptr
=
s
->
edge_emu_buffer
+
src_offset
;
emu
=
1
;
}
}
...
...
@@ -1409,15 +1413,17 @@ static inline void qpel_motion(MpegEncContext *s,
offset
=
(
src_y
*
uvlinesize
)
+
src_x
+
(
src_offset
>>
1
);
ptr
=
ref_picture
[
1
]
+
offset
;
if
(
emu
){
emulated_edge_mc
(
s
,
ptr
,
uvlinesize
,
9
,
(
h
>>
1
)
+
1
,
src_x
,
src_y
,
s
->
h_edge_pos
>>
1
,
v_edge_pos
>>
1
);
ptr
=
s
->
edge_emu_buffer
;
emulated_edge_mc
(
s
,
ptr
-
(
src_offset
>>
1
),
s
->
uvlinesize
,
9
,
9
+
field_based
,
src_x
,
src_y
<<
field_based
,
s
->
h_edge_pos
>>
1
,
s
->
v_edge_pos
>>
1
);
ptr
=
s
->
edge_emu_buffer
+
(
src_offset
>>
1
);
}
pix_op
[
1
][
dxy
](
dest_cb
+
(
dest_offset
>>
1
),
ptr
,
uvlinesize
,
h
>>
1
);
ptr
=
ref_picture
[
2
]
+
offset
;
if
(
emu
){
emulated_edge_mc
(
s
,
ptr
,
uvlinesize
,
9
,
(
h
>>
1
)
+
1
,
src_x
,
src_y
,
s
->
h_edge_pos
>>
1
,
v_edge_pos
>>
1
);
ptr
=
s
->
edge_emu_buffer
;
emulated_edge_mc
(
s
,
ptr
-
(
src_offset
>>
1
),
s
->
uvlinesize
,
9
,
9
+
field_based
,
src_x
,
src_y
<<
field_based
,
s
->
h_edge_pos
>>
1
,
s
->
v_edge_pos
>>
1
);
ptr
=
s
->
edge_emu_buffer
+
(
src_offset
>>
1
);
}
pix_op
[
1
][
dxy
](
dest_cr
+
(
dest_offset
>>
1
),
ptr
,
uvlinesize
,
h
>>
1
);
}
...
...
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