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
84099f51
Commit
84099f51
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
smacker: use the AVFrame API properly.
parent
5c96f029
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
16 deletions
+19
-16
smacker.c
libavcodec/smacker.c
+19
-16
No files found.
libavcodec/smacker.c
View file @
84099f51
...
...
@@ -48,7 +48,7 @@
*/
typedef
struct
SmackVContext
{
AVCodecContext
*
avctx
;
AVFrame
pic
;
AVFrame
*
pic
;
int
*
mmap_tbl
,
*
mclr_tbl
,
*
full_tbl
,
*
type_tbl
;
int
mmap_last
[
3
],
mclr_last
[
3
],
full_last
[
3
],
type_last
[
3
];
...
...
@@ -391,21 +391,21 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if
(
avpkt
->
size
<=
769
)
return
0
;
if
((
ret
=
ff_reget_buffer
(
avctx
,
&
smk
->
pic
))
<
0
)
{
if
((
ret
=
ff_reget_buffer
(
avctx
,
smk
->
pic
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
ret
;
}
/* make the palette available on the way out */
pal
=
(
uint32_t
*
)
smk
->
pic
.
data
[
1
];
pal
=
(
uint32_t
*
)
smk
->
pic
->
data
[
1
];
bytestream2_init
(
&
gb2
,
avpkt
->
data
,
avpkt
->
size
);
flags
=
bytestream2_get_byteu
(
&
gb2
);
smk
->
pic
.
palette_has_changed
=
flags
&
1
;
smk
->
pic
.
key_frame
=
!!
(
flags
&
2
);
if
(
smk
->
pic
.
key_frame
)
smk
->
pic
.
pict_type
=
AV_PICTURE_TYPE_I
;
smk
->
pic
->
palette_has_changed
=
flags
&
1
;
smk
->
pic
->
key_frame
=
!!
(
flags
&
2
);
if
(
smk
->
pic
->
key_frame
)
smk
->
pic
->
pict_type
=
AV_PICTURE_TYPE_I
;
else
smk
->
pic
.
pict_type
=
AV_PICTURE_TYPE_P
;
smk
->
pic
->
pict_type
=
AV_PICTURE_TYPE_P
;
for
(
i
=
0
;
i
<
256
;
i
++
)
*
pal
++
=
bytestream2_get_be24u
(
&
gb2
);
...
...
@@ -420,8 +420,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
bw
=
avctx
->
width
>>
2
;
bh
=
avctx
->
height
>>
2
;
blocks
=
bw
*
bh
;
out
=
smk
->
pic
.
data
[
0
];
stride
=
smk
->
pic
.
linesize
[
0
];
out
=
smk
->
pic
->
data
[
0
];
stride
=
smk
->
pic
->
linesize
[
0
];
while
(
blk
<
blocks
)
{
int
type
,
run
,
mode
;
uint16_t
pix
;
...
...
@@ -435,7 +435,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
int
hi
,
lo
;
clr
=
smk_get_code
(
&
gb
,
smk
->
mclr_tbl
,
smk
->
mclr_last
);
map
=
smk_get_code
(
&
gb
,
smk
->
mmap_tbl
,
smk
->
mmap_last
);
out
=
smk
->
pic
.
data
[
0
]
+
(
blk
/
bw
)
*
(
stride
*
4
)
+
(
blk
%
bw
)
*
4
;
out
=
smk
->
pic
->
data
[
0
]
+
(
blk
/
bw
)
*
(
stride
*
4
)
+
(
blk
%
bw
)
*
4
;
hi
=
clr
>>
8
;
lo
=
clr
&
0xFF
;
for
(
i
=
0
;
i
<
4
;
i
++
)
{
...
...
@@ -456,7 +456,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
else
if
(
get_bits1
(
&
gb
))
mode
=
2
;
}
while
(
run
--
&&
blk
<
blocks
){
out
=
smk
->
pic
.
data
[
0
]
+
(
blk
/
bw
)
*
(
stride
*
4
)
+
(
blk
%
bw
)
*
4
;
out
=
smk
->
pic
->
data
[
0
]
+
(
blk
/
bw
)
*
(
stride
*
4
)
+
(
blk
%
bw
)
*
4
;
switch
(
mode
){
case
0
:
for
(
i
=
0
;
i
<
4
;
i
++
)
{
...
...
@@ -508,7 +508,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
mode
=
type
>>
8
;
while
(
run
--
&&
blk
<
blocks
){
uint32_t
col
;
out
=
smk
->
pic
.
data
[
0
]
+
(
blk
/
bw
)
*
(
stride
*
4
)
+
(
blk
%
bw
)
*
4
;
out
=
smk
->
pic
->
data
[
0
]
+
(
blk
/
bw
)
*
(
stride
*
4
)
+
(
blk
%
bw
)
*
4
;
col
=
mode
*
0x01010101
;
for
(
i
=
0
;
i
<
4
;
i
++
)
{
*
((
uint32_t
*
)
out
)
=
col
;
...
...
@@ -521,7 +521,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
}
if
((
ret
=
av_frame_ref
(
data
,
&
smk
->
pic
))
<
0
)
if
((
ret
=
av_frame_ref
(
data
,
smk
->
pic
))
<
0
)
return
ret
;
*
got_frame
=
1
;
...
...
@@ -546,7 +546,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
av_freep
(
&
smk
->
full_tbl
);
av_freep
(
&
smk
->
type_tbl
);
av_frame_
unref
(
&
smk
->
pic
);
av_frame_
free
(
&
smk
->
pic
);
return
0
;
}
...
...
@@ -564,7 +564,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
c
->
avctx
=
avctx
;
avctx
->
pix_fmt
=
AV_PIX_FMT_PAL8
;
avcodec_get_frame_defaults
(
&
c
->
pic
);
c
->
pic
=
av_frame_alloc
();
if
(
!
c
->
pic
)
return
AVERROR
(
ENOMEM
);
/* decode huffman trees from extradata */
if
(
avctx
->
extradata_size
<
16
){
...
...
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