Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
7a74e067
Commit
7a74e067
authored
17 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
Fix a bunch of typos in comments.
Originally committed as revision 12656 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
d8c0e9d5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/xvmcvideo.c
+12
-12
12 additions, 12 deletions
libavcodec/xvmcvideo.c
with
12 additions
and
12 deletions
libavcodec/xvmcvideo.c
+
12
−
12
View file @
7a74e067
...
@@ -29,8 +29,8 @@
...
@@ -29,8 +29,8 @@
#undef NDEBUG
#undef NDEBUG
#include
<assert.h>
#include
<assert.h>
//X11 includes are in
the
xvmc_render.h
//X11 includes are in xvmc_render.h
//by replacing it with non
e
-X one
//by replacing it with non-X one
//XvMC emulation could be performed
//XvMC emulation could be performed
#include
"xvmc_render.h"
#include
"xvmc_render.h"
...
@@ -44,7 +44,7 @@ xvmc_render_state_t * render;
...
@@ -44,7 +44,7 @@ xvmc_render_state_t * render;
assert
(
render
!=
NULL
);
assert
(
render
!=
NULL
);
if
(
(
render
==
NULL
)
||
(
render
->
magic
!=
MP_XVMC_RENDER_MAGIC
)
){
if
(
(
render
==
NULL
)
||
(
render
->
magic
!=
MP_XVMC_RENDER_MAGIC
)
){
assert
(
0
);
assert
(
0
);
return
;
//make sure that this is render packet
return
;
//make sure that this is
a
render packet
}
}
s
->
block
=
(
DCTELEM
*
)(
render
->
data_blocks
+
(
render
->
next_free_data_block_num
)
*
64
);
s
->
block
=
(
DCTELEM
*
)(
render
->
data_blocks
+
(
render
->
next_free_data_block_num
)
*
64
);
}
}
...
@@ -66,8 +66,8 @@ const int mb_block_count = 4+(1<<s->chroma_format);
...
@@ -66,8 +66,8 @@ const int mb_block_count = 4+(1<<s->chroma_format);
}
}
}
}
//
t
hese functions should be called on every new field
or/
and frame
//
T
hese functions should be called on every new field and
/or
frame
.
//They should be safe if they are called few times for same field!
//They should be safe if they are called
a
few times for
the
same field!
int
XVMC_field_start
(
MpegEncContext
*
s
,
AVCodecContext
*
avctx
){
int
XVMC_field_start
(
MpegEncContext
*
s
,
AVCodecContext
*
avctx
){
xvmc_render_state_t
*
render
,
*
last
,
*
next
;
xvmc_render_state_t
*
render
,
*
last
,
*
next
;
...
@@ -147,8 +147,8 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
...
@@ -147,8 +147,8 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
s
->
mb_skipped
=
0
;
s
->
mb_skipped
=
0
;
//
d
o I need to export quant when I could not perform postprocessing?
//
D
o I need to export quant when I could not perform postprocessing?
//
a
nyway, it doesn't hur
r
t
//
A
nyway, it doesn't hurt
.
s
->
current_picture
.
qscale_table
[
mb_xy
]
=
s
->
qscale
;
s
->
current_picture
.
qscale_table
[
mb_xy
]
=
s
->
qscale
;
//START OF XVMC specific code
//START OF XVMC specific code
...
@@ -166,7 +166,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
...
@@ -166,7 +166,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
mv_block
->
x
=
s
->
mb_x
;
mv_block
->
x
=
s
->
mb_x
;
mv_block
->
y
=
s
->
mb_y
;
mv_block
->
y
=
s
->
mb_y
;
mv_block
->
dct_type
=
s
->
interlaced_dct
;
//XVMC_DCT_TYPE_FRAME/FIELD;
mv_block
->
dct_type
=
s
->
interlaced_dct
;
//XVMC_DCT_TYPE_FRAME/FIELD;
// mv_block->motion_type = 0; //zero to silen
s
e warnings
// mv_block->motion_type = 0; //zero to silen
c
e warnings
if
(
s
->
mb_intra
){
if
(
s
->
mb_intra
){
mv_block
->
macroblock_type
=
XVMC_MB_TYPE_INTRA
;
//no MC, all done
mv_block
->
macroblock_type
=
XVMC_MB_TYPE_INTRA
;
//no MC, all done
}
else
{
}
else
{
...
@@ -231,7 +231,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
...
@@ -231,7 +231,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
mv_block
->
motion_vertical_field_select
=
0
;
mv_block
->
motion_vertical_field_select
=
0
;
//set correct field referen
s
es
//set correct field referen
c
es
if
(
s
->
mv_type
==
MV_TYPE_FIELD
||
s
->
mv_type
==
MV_TYPE_16X8
){
if
(
s
->
mv_type
==
MV_TYPE_FIELD
||
s
->
mv_type
==
MV_TYPE_16X8
){
if
(
s
->
field_select
[
0
][
0
]
)
mv_block
->
motion_vertical_field_select
|=
1
;
if
(
s
->
field_select
[
0
][
0
]
)
mv_block
->
motion_vertical_field_select
|=
1
;
if
(
s
->
field_select
[
1
][
0
]
)
mv_block
->
motion_vertical_field_select
|=
2
;
if
(
s
->
field_select
[
1
][
0
]
)
mv_block
->
motion_vertical_field_select
|=
2
;
...
@@ -256,7 +256,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
...
@@ -256,7 +256,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
}
}
if
(
s
->
flags
&
CODEC_FLAG_GRAY
){
if
(
s
->
flags
&
CODEC_FLAG_GRAY
){
if
(
s
->
mb_intra
){
//intra frames are alwa
s
y full chroma block
if
(
s
->
mb_intra
){
//intra frames are alway
s
full chroma block
for
(
i
=
4
;
i
<
blocks_per_mb
;
i
++
){
for
(
i
=
4
;
i
<
blocks_per_mb
;
i
++
){
memset
(
s
->
pblocks
[
i
],
0
,
sizeof
(
short
)
*
8
*
8
);
//so we need to clear them
memset
(
s
->
pblocks
[
i
],
0
,
sizeof
(
short
)
*
8
*
8
);
//so we need to clear them
if
(
!
render
->
unsigned_intra
)
if
(
!
render
->
unsigned_intra
)
...
@@ -264,7 +264,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
...
@@ -264,7 +264,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
}
}
}
else
{
}
else
{
cbp
&=
0xf
<<
(
blocks_per_mb
-
4
);
cbp
&=
0xf
<<
(
blocks_per_mb
-
4
);
blocks_per_mb
=
4
;
//
L
uminance blocks only
blocks_per_mb
=
4
;
//
l
uminance blocks only
}
}
}
}
mv_block
->
coded_block_pattern
=
cbp
;
mv_block
->
coded_block_pattern
=
cbp
;
...
@@ -273,7 +273,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
...
@@ -273,7 +273,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
for
(
i
=
0
;
i
<
blocks_per_mb
;
i
++
){
for
(
i
=
0
;
i
<
blocks_per_mb
;
i
++
){
if
(
s
->
block_last_index
[
i
]
>=
0
){
if
(
s
->
block_last_index
[
i
]
>=
0
){
// I do not have unsigned_intra MOCO to test, hope it is OK
// I do not have unsigned_intra MOCO to test, hope it is OK
.
if
(
(
s
->
mb_intra
)
&&
(
render
->
idct
||
(
!
render
->
idct
&&
!
render
->
unsigned_intra
))
)
if
(
(
s
->
mb_intra
)
&&
(
render
->
idct
||
(
!
render
->
idct
&&
!
render
->
unsigned_intra
))
)
s
->
pblocks
[
i
][
0
]
-=
1
<<
10
;
s
->
pblocks
[
i
][
0
]
-=
1
<<
10
;
if
(
!
render
->
idct
){
if
(
!
render
->
idct
){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment