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
209f92d9
Commit
209f92d9
authored
Jul 15, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: add seperate AVCodec for CODEC_ID_H263P so demuxers can use that id.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
8d0ec6e0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
allcodecs.c
libavcodec/allcodecs.c
+1
-1
h263dec.c
libavcodec/h263dec.c
+20
-1
No files found.
libavcodec/allcodecs.c
View file @
209f92d9
...
...
@@ -128,7 +128,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC
(
H261
,
h261
);
REGISTER_ENCDEC
(
H263
,
h263
);
REGISTER_DECODER
(
H263I
,
h263i
);
REGISTER_ENC
ODER
(
H263P
,
h263p
);
REGISTER_ENC
DEC
(
H263P
,
h263p
);
REGISTER_DECODER
(
H264
,
h264
);
REGISTER_DECODER
(
H264_CRYSTALHD
,
h264_crystalhd
);
REGISTER_DECODER
(
H264_VDPAU
,
h264_vdpau
);
...
...
libavcodec/h263dec.c
View file @
209f92d9
...
...
@@ -66,6 +66,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
/* select sub codec */
switch
(
avctx
->
codec
->
id
)
{
case
CODEC_ID_H263
:
case
CODEC_ID_H263P
:
s
->
unrestricted_mv
=
0
;
avctx
->
chroma_sample_location
=
AVCHROMA_LOC_CENTER
;
break
;
...
...
@@ -111,7 +112,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
avctx
->
hwaccel
=
ff_find_hwaccel
(
avctx
->
codec
->
id
,
avctx
->
pix_fmt
);
/* for h263, we allocate the images after having read the header */
if
(
avctx
->
codec
->
id
!=
CODEC_ID_H263
&&
avctx
->
codec
->
id
!=
CODEC_ID_MPEG4
)
if
(
avctx
->
codec
->
id
!=
CODEC_ID_H263
&&
avctx
->
codec
->
id
!=
CODEC_ID_
H263P
&&
avctx
->
codec
->
id
!=
CODEC_ID_
MPEG4
)
if
(
ff_MPV_common_init
(
s
)
<
0
)
return
-
1
;
...
...
@@ -373,6 +374,8 @@ uint64_t time= rdtsc();
next
=
ff_mpeg4_find_frame_end
(
&
s
->
parse_context
,
buf
,
buf_size
);
}
else
if
(
CONFIG_H263_DECODER
&&
s
->
codec_id
==
CODEC_ID_H263
){
next
=
ff_h263_find_frame_end
(
&
s
->
parse_context
,
buf
,
buf_size
);
}
else
if
(
CONFIG_H263P_DECODER
&&
s
->
codec_id
==
CODEC_ID_H263P
){
next
=
ff_h263_find_frame_end
(
&
s
->
parse_context
,
buf
,
buf_size
);
}
else
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"this codec does not support truncated bitstreams
\n
"
);
return
-
1
;
...
...
@@ -770,3 +773,19 @@ AVCodec ff_h263_decoder = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"
),
.
pix_fmts
=
ff_hwaccel_pixfmt_list_420
,
};
AVCodec
ff_h263p_decoder
=
{
.
name
=
"h263p"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
CODEC_ID_H263P
,
.
priv_data_size
=
sizeof
(
MpegEncContext
),
.
init
=
ff_h263_decode_init
,
.
close
=
ff_h263_decode_end
,
.
decode
=
ff_h263_decode_frame
,
.
capabilities
=
CODEC_CAP_DRAW_HORIZ_BAND
|
CODEC_CAP_DR1
|
CODEC_CAP_TRUNCATED
|
CODEC_CAP_DELAY
,
.
flush
=
ff_mpeg_flush
,
.
max_lowres
=
3
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"
),
.
pix_fmts
=
ff_hwaccel_pixfmt_list_420
,
};
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