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
14b35bf0
Commit
14b35bf0
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huffyuv: use the AVFrame API properly.
parent
ffe04c33
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
huffyuv.h
libavcodec/huffyuv.h
+0
-1
huffyuvenc.c
libavcodec/huffyuvenc.c
+9
-6
No files found.
libavcodec/huffyuv.h
View file @
14b35bf0
...
...
@@ -78,7 +78,6 @@ typedef struct HYuvContext {
uint32_t
bits
[
3
][
256
];
uint32_t
pix_bgr_map
[
1
<<
VLC_BITS
];
VLC
vlc
[
6
];
//Y,U,V,YY,YU,YV
AVFrame
picture
;
uint8_t
*
bitstream_buffer
;
unsigned
int
bitstream_buffer_size
;
DSPContext
dsp
;
...
...
libavcodec/huffyuvenc.c
View file @
14b35bf0
...
...
@@ -151,7 +151,12 @@ static av_cold int encode_init(AVCodecContext *avctx)
avctx
->
stats_out
=
av_mallocz
(
1024
*
30
);
// 21*256*3(%llu ) + 3(\n) + 1(0) = 16132
s
->
version
=
2
;
avctx
->
coded_frame
=
&
s
->
picture
;
avctx
->
coded_frame
=
av_frame_alloc
();
if
(
!
avctx
->
coded_frame
)
return
AVERROR
(
ENOMEM
);
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_I
;
avctx
->
coded_frame
->
key_frame
=
1
;
switch
(
avctx
->
pix_fmt
)
{
case
AV_PIX_FMT_YUV420P
:
...
...
@@ -438,7 +443,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const
int
fake_ystride
=
s
->
interlaced
?
pict
->
linesize
[
0
]
*
2
:
pict
->
linesize
[
0
];
const
int
fake_ustride
=
s
->
interlaced
?
pict
->
linesize
[
1
]
*
2
:
pict
->
linesize
[
1
];
const
int
fake_vstride
=
s
->
interlaced
?
pict
->
linesize
[
2
]
*
2
:
pict
->
linesize
[
2
];
AVFrame
*
const
p
=
&
s
->
picture
;
const
AVFrame
*
const
p
=
pict
;
int
i
,
j
,
size
=
0
,
ret
;
if
(
!
pkt
->
data
&&
...
...
@@ -447,10 +452,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return
ret
;
}
*
p
=
*
pict
;
p
->
pict_type
=
AV_PICTURE_TYPE_I
;
p
->
key_frame
=
1
;
if
(
s
->
context
)
{
for
(
i
=
0
;
i
<
3
;
i
++
)
{
ff_huff_gen_len_table
(
s
->
len
[
i
],
s
->
stats
[
i
]);
...
...
@@ -676,6 +677,8 @@ static av_cold int encode_end(AVCodecContext *avctx)
av_freep
(
&
avctx
->
extradata
);
av_freep
(
&
avctx
->
stats_out
);
av_frame_free
(
&
avctx
->
coded_frame
);
return
0
;
}
...
...
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