Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
e52f38bc
Commit
e52f38bc
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
motionpixels: use the AVFrame API properly.
parent
aca21478
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
22 deletions
+28
-22
motionpixels.c
libavcodec/motionpixels.c
+28
-22
No files found.
libavcodec/motionpixels.c
View file @
e52f38bc
...
@@ -36,7 +36,7 @@ typedef struct HuffCode {
...
@@ -36,7 +36,7 @@ typedef struct HuffCode {
typedef
struct
MotionPixelsContext
{
typedef
struct
MotionPixelsContext
{
AVCodecContext
*
avctx
;
AVCodecContext
*
avctx
;
AVFrame
frame
;
AVFrame
*
frame
;
DSPContext
dsp
;
DSPContext
dsp
;
uint8_t
*
changes_map
;
uint8_t
*
changes_map
;
int
offset_bits_len
;
int
offset_bits_len
;
...
@@ -50,6 +50,19 @@ typedef struct MotionPixelsContext {
...
@@ -50,6 +50,19 @@ typedef struct MotionPixelsContext {
int
bswapbuf_size
;
int
bswapbuf_size
;
}
MotionPixelsContext
;
}
MotionPixelsContext
;
static
av_cold
int
mp_decode_end
(
AVCodecContext
*
avctx
)
{
MotionPixelsContext
*
mp
=
avctx
->
priv_data
;
av_freep
(
&
mp
->
changes_map
);
av_freep
(
&
mp
->
vpt
);
av_freep
(
&
mp
->
hpt
);
av_freep
(
&
mp
->
bswapbuf
);
av_frame_free
(
&
mp
->
frame
);
return
0
;
}
static
av_cold
int
mp_decode_init
(
AVCodecContext
*
avctx
)
static
av_cold
int
mp_decode_init
(
AVCodecContext
*
avctx
)
{
{
MotionPixelsContext
*
mp
=
avctx
->
priv_data
;
MotionPixelsContext
*
mp
=
avctx
->
priv_data
;
...
@@ -64,7 +77,13 @@ static av_cold int mp_decode_init(AVCodecContext *avctx)
...
@@ -64,7 +77,13 @@ static av_cold int mp_decode_init(AVCodecContext *avctx)
mp
->
vpt
=
av_mallocz
(
avctx
->
height
*
sizeof
(
YuvPixel
));
mp
->
vpt
=
av_mallocz
(
avctx
->
height
*
sizeof
(
YuvPixel
));
mp
->
hpt
=
av_mallocz
(
h4
*
w4
/
16
*
sizeof
(
YuvPixel
));
mp
->
hpt
=
av_mallocz
(
h4
*
w4
/
16
*
sizeof
(
YuvPixel
));
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB555
;
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB555
;
avcodec_get_frame_defaults
(
&
mp
->
frame
);
mp
->
frame
=
av_frame_alloc
();
if
(
!
mp
->
frame
)
{
mp_decode_end
(
avctx
);
return
AVERROR
(
ENOMEM
);
}
return
0
;
return
0
;
}
}
...
@@ -85,14 +104,14 @@ static void mp_read_changes_map(MotionPixelsContext *mp, GetBitContext *gb, int
...
@@ -85,14 +104,14 @@ static void mp_read_changes_map(MotionPixelsContext *mp, GetBitContext *gb, int
continue
;
continue
;
w
=
FFMIN
(
w
,
mp
->
avctx
->
width
-
x
);
w
=
FFMIN
(
w
,
mp
->
avctx
->
width
-
x
);
h
=
FFMIN
(
h
,
mp
->
avctx
->
height
-
y
);
h
=
FFMIN
(
h
,
mp
->
avctx
->
height
-
y
);
pixels
=
(
uint16_t
*
)
&
mp
->
frame
.
data
[
0
][
y
*
mp
->
frame
.
linesize
[
0
]
+
x
*
2
];
pixels
=
(
uint16_t
*
)
&
mp
->
frame
->
data
[
0
][
y
*
mp
->
frame
->
linesize
[
0
]
+
x
*
2
];
while
(
h
--
)
{
while
(
h
--
)
{
mp
->
changes_map
[
offset
]
=
w
;
mp
->
changes_map
[
offset
]
=
w
;
if
(
read_color
)
if
(
read_color
)
for
(
i
=
0
;
i
<
w
;
++
i
)
for
(
i
=
0
;
i
<
w
;
++
i
)
pixels
[
i
]
=
color
;
pixels
[
i
]
=
color
;
offset
+=
mp
->
avctx
->
width
;
offset
+=
mp
->
avctx
->
width
;
pixels
+=
mp
->
frame
.
linesize
[
0
]
/
2
;
pixels
+=
mp
->
frame
->
linesize
[
0
]
/
2
;
}
}
}
}
}
}
...
@@ -144,7 +163,7 @@ static YuvPixel mp_get_yuv_from_rgb(MotionPixelsContext *mp, int x, int y)
...
@@ -144,7 +163,7 @@ static YuvPixel mp_get_yuv_from_rgb(MotionPixelsContext *mp, int x, int y)
{
{
int
color
;
int
color
;
color
=
*
(
uint16_t
*
)
&
mp
->
frame
.
data
[
0
][
y
*
mp
->
frame
.
linesize
[
0
]
+
x
*
2
];
color
=
*
(
uint16_t
*
)
&
mp
->
frame
->
data
[
0
][
y
*
mp
->
frame
->
linesize
[
0
]
+
x
*
2
];
return
mp_rgb_yuv_table
[
color
];
return
mp_rgb_yuv_table
[
color
];
}
}
...
@@ -153,7 +172,7 @@ static void mp_set_rgb_from_yuv(MotionPixelsContext *mp, int x, int y, const Yuv
...
@@ -153,7 +172,7 @@ static void mp_set_rgb_from_yuv(MotionPixelsContext *mp, int x, int y, const Yuv
int
color
;
int
color
;
color
=
mp_yuv_to_rgb
(
p
->
y
,
p
->
v
,
p
->
u
,
1
);
color
=
mp_yuv_to_rgb
(
p
->
y
,
p
->
v
,
p
->
u
,
1
);
*
(
uint16_t
*
)
&
mp
->
frame
.
data
[
0
][
y
*
mp
->
frame
.
linesize
[
0
]
+
x
*
2
]
=
color
;
*
(
uint16_t
*
)
&
mp
->
frame
->
data
[
0
][
y
*
mp
->
frame
->
linesize
[
0
]
+
x
*
2
]
=
color
;
}
}
static
int
mp_get_vlc
(
MotionPixelsContext
*
mp
,
GetBitContext
*
gb
)
static
int
mp_get_vlc
(
MotionPixelsContext
*
mp
,
GetBitContext
*
gb
)
...
@@ -248,7 +267,7 @@ static int mp_decode_frame(AVCodecContext *avctx,
...
@@ -248,7 +267,7 @@ static int mp_decode_frame(AVCodecContext *avctx,
GetBitContext
gb
;
GetBitContext
gb
;
int
i
,
count1
,
count2
,
sz
,
ret
;
int
i
,
count1
,
count2
,
sz
,
ret
;
if
((
ret
=
ff_reget_buffer
(
avctx
,
&
mp
->
frame
))
<
0
)
{
if
((
ret
=
ff_reget_buffer
(
avctx
,
mp
->
frame
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"reget_buffer() failed
\n
"
);
return
ret
;
return
ret
;
}
}
...
@@ -276,7 +295,7 @@ static int mp_decode_frame(AVCodecContext *avctx,
...
@@ -276,7 +295,7 @@ static int mp_decode_frame(AVCodecContext *avctx,
goto
end
;
goto
end
;
if
(
mp
->
changes_map
[
0
]
==
0
)
{
if
(
mp
->
changes_map
[
0
]
==
0
)
{
*
(
uint16_t
*
)
mp
->
frame
.
data
[
0
]
=
get_bits
(
&
gb
,
15
);
*
(
uint16_t
*
)
mp
->
frame
->
data
[
0
]
=
get_bits
(
&
gb
,
15
);
mp
->
changes_map
[
0
]
=
1
;
mp
->
changes_map
[
0
]
=
1
;
}
}
mp_read_codes_table
(
mp
,
&
gb
);
mp_read_codes_table
(
mp
,
&
gb
);
...
@@ -295,25 +314,12 @@ static int mp_decode_frame(AVCodecContext *avctx,
...
@@ -295,25 +314,12 @@ static int mp_decode_frame(AVCodecContext *avctx,
ff_free_vlc
(
&
mp
->
vlc
);
ff_free_vlc
(
&
mp
->
vlc
);
end:
end:
if
((
ret
=
av_frame_ref
(
data
,
&
mp
->
frame
))
<
0
)
if
((
ret
=
av_frame_ref
(
data
,
mp
->
frame
))
<
0
)
return
ret
;
return
ret
;
*
got_frame
=
1
;
*
got_frame
=
1
;
return
buf_size
;
return
buf_size
;
}
}
static
av_cold
int
mp_decode_end
(
AVCodecContext
*
avctx
)
{
MotionPixelsContext
*
mp
=
avctx
->
priv_data
;
av_freep
(
&
mp
->
changes_map
);
av_freep
(
&
mp
->
vpt
);
av_freep
(
&
mp
->
hpt
);
av_freep
(
&
mp
->
bswapbuf
);
av_frame_unref
(
&
mp
->
frame
);
return
0
;
}
AVCodec
ff_motionpixels_decoder
=
{
AVCodec
ff_motionpixels_decoder
=
{
.
name
=
"motionpixels"
,
.
name
=
"motionpixels"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Motion Pixels video"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Motion Pixels video"
),
...
...
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