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
3c8ea9d4
Commit
3c8ea9d4
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vmnc: use the AVFrame API properly.
parent
04f30711
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
18 deletions
+20
-18
vmnc.c
libavcodec/vmnc.c
+20
-18
No files found.
libavcodec/vmnc.c
View file @
3c8ea9d4
...
...
@@ -57,7 +57,7 @@ enum HexTile_Flags {
*/
typedef
struct
VmncContext
{
AVCodecContext
*
avctx
;
AVFrame
pic
;
AVFrame
*
pic
;
int
bpp
;
int
bpp2
;
...
...
@@ -319,15 +319,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
uint8_t
*
outptr
;
int
dx
,
dy
,
w
,
h
,
depth
,
enc
,
chunks
,
res
,
size_left
,
ret
;
if
((
ret
=
ff_reget_buffer
(
avctx
,
&
c
->
pic
))
<
0
)
{
if
((
ret
=
ff_reget_buffer
(
avctx
,
c
->
pic
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
return
ret
;
}
bytestream2_init
(
gb
,
buf
,
buf_size
);
c
->
pic
.
key_frame
=
0
;
c
->
pic
.
pict_type
=
AV_PICTURE_TYPE_P
;
c
->
pic
->
key_frame
=
0
;
c
->
pic
->
pict_type
=
AV_PICTURE_TYPE_P
;
// restore screen after cursor
if
(
c
->
screendta
)
{
...
...
@@ -349,11 +349,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
dy
=
0
;
}
if
((
w
>
0
)
&&
(
h
>
0
))
{
outptr
=
c
->
pic
.
data
[
0
]
+
dx
*
c
->
bpp2
+
dy
*
c
->
pic
.
linesize
[
0
];
outptr
=
c
->
pic
->
data
[
0
]
+
dx
*
c
->
bpp2
+
dy
*
c
->
pic
->
linesize
[
0
];
for
(
i
=
0
;
i
<
h
;
i
++
)
{
memcpy
(
outptr
,
c
->
screendta
+
i
*
c
->
cur_w
*
c
->
bpp2
,
w
*
c
->
bpp2
);
outptr
+=
c
->
pic
.
linesize
[
0
];
outptr
+=
c
->
pic
->
linesize
[
0
];
}
}
}
...
...
@@ -365,7 +365,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
w
=
bytestream2_get_be16
(
gb
);
h
=
bytestream2_get_be16
(
gb
);
enc
=
bytestream2_get_be32
(
gb
);
outptr
=
c
->
pic
.
data
[
0
]
+
dx
*
c
->
bpp2
+
dy
*
c
->
pic
.
linesize
[
0
];
outptr
=
c
->
pic
->
data
[
0
]
+
dx
*
c
->
bpp2
+
dy
*
c
->
pic
->
linesize
[
0
];
size_left
=
bytestream2_get_bytes_left
(
gb
);
switch
(
enc
)
{
case
MAGIC_WMVd
:
// cursor
...
...
@@ -415,8 +415,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
bytestream2_skip
(
gb
,
4
);
break
;
case
MAGIC_WMVi
:
// ServerInitialization struct
c
->
pic
.
key_frame
=
1
;
c
->
pic
.
pict_type
=
AV_PICTURE_TYPE_I
;
c
->
pic
->
key_frame
=
1
;
c
->
pic
->
pict_type
=
AV_PICTURE_TYPE_I
;
depth
=
bytestream2_get_byte
(
gb
);
if
(
depth
!=
c
->
bpp
)
{
av_log
(
avctx
,
AV_LOG_INFO
,
...
...
@@ -451,7 +451,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return
AVERROR_INVALIDDATA
;
}
paint_raw
(
outptr
,
w
,
h
,
gb
,
c
->
bpp2
,
c
->
bigendian
,
c
->
pic
.
linesize
[
0
]);
c
->
pic
->
linesize
[
0
]);
break
;
case
0x00000005
:
// HexTile encoded rectangle
if
((
dx
+
w
>
c
->
width
)
||
(
dy
+
h
>
c
->
height
))
{
...
...
@@ -460,7 +460,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
w
,
h
,
dx
,
dy
,
c
->
width
,
c
->
height
);
return
AVERROR_INVALIDDATA
;
}
res
=
decode_hextile
(
c
,
outptr
,
gb
,
w
,
h
,
c
->
pic
.
linesize
[
0
]);
res
=
decode_hextile
(
c
,
outptr
,
gb
,
w
,
h
,
c
->
pic
->
linesize
[
0
]);
if
(
res
<
0
)
return
res
;
break
;
...
...
@@ -489,18 +489,18 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
dy
=
0
;
}
if
((
w
>
0
)
&&
(
h
>
0
))
{
outptr
=
c
->
pic
.
data
[
0
]
+
dx
*
c
->
bpp2
+
dy
*
c
->
pic
.
linesize
[
0
];
outptr
=
c
->
pic
->
data
[
0
]
+
dx
*
c
->
bpp2
+
dy
*
c
->
pic
->
linesize
[
0
];
for
(
i
=
0
;
i
<
h
;
i
++
)
{
memcpy
(
c
->
screendta
+
i
*
c
->
cur_w
*
c
->
bpp2
,
outptr
,
w
*
c
->
bpp2
);
outptr
+=
c
->
pic
.
linesize
[
0
];
outptr
+=
c
->
pic
->
linesize
[
0
];
}
outptr
=
c
->
pic
.
data
[
0
];
put_cursor
(
outptr
,
c
->
pic
.
linesize
[
0
],
c
,
c
->
cur_x
,
c
->
cur_y
);
outptr
=
c
->
pic
->
data
[
0
];
put_cursor
(
outptr
,
c
->
pic
->
linesize
[
0
],
c
,
c
->
cur_x
,
c
->
cur_y
);
}
}
*
got_frame
=
1
;
if
((
ret
=
av_frame_ref
(
data
,
&
c
->
pic
))
<
0
)
if
((
ret
=
av_frame_ref
(
data
,
c
->
pic
))
<
0
)
return
ret
;
/* always report that the buffer was completely consumed */
...
...
@@ -532,7 +532,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
return
AVERROR_INVALIDDATA
;
}
avcodec_get_frame_defaults
(
&
c
->
pic
);
c
->
pic
=
av_frame_alloc
();
if
(
!
c
->
pic
)
return
AVERROR
(
ENOMEM
);
return
0
;
}
...
...
@@ -541,7 +543,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
{
VmncContext
*
const
c
=
avctx
->
priv_data
;
av_frame_
unref
(
&
c
->
pic
);
av_frame_
free
(
&
c
->
pic
);
av_free
(
c
->
curbits
);
av_free
(
c
->
curmask
);
...
...
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