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
c5fca017
Commit
c5fca017
authored
Jul 20, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: add a property for marking codecs that support frame reordering
parent
42eb9154
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
17 deletions
+30
-17
APIchanges
doc/APIchanges
+3
-0
avcodec.h
libavcodec/avcodec.h
+10
-0
codec_desc.c
libavcodec/codec_desc.c
+16
-16
version.h
libavcodec/version.h
+1
-1
No files found.
doc/APIchanges
View file @
c5fca017
...
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
...
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
API changes, most recent first:
API changes, most recent first:
2014-xx-xx - xxxxxxx - lavc 55.57.0 - avcodec.h
Add AV_CODEC_PROP_REORDER to mark codecs supporting frame reordering.
2014-07-xx - xxxxxxx - lavu 53.18.0 - display.h
2014-07-xx - xxxxxxx - lavu 53.18.0 - display.h
Add av_display_matrix_flip() to flip the transformation matrix.
Add av_display_matrix_flip() to flip the transformation matrix.
...
...
libavcodec/avcodec.h
View file @
c5fca017
...
@@ -509,6 +509,16 @@ typedef struct AVCodecDescriptor {
...
@@ -509,6 +509,16 @@ typedef struct AVCodecDescriptor {
* Codec supports lossless compression. Audio and video codecs only.
* Codec supports lossless compression. Audio and video codecs only.
*/
*/
#define AV_CODEC_PROP_LOSSLESS (1 << 2)
#define AV_CODEC_PROP_LOSSLESS (1 << 2)
/**
* Codec supports frame reordering. That is, the coded order (the order in which
* the encoded packets are output by the encoders / stored / input to the
* decoders) may be different from the presentation order of the corresponding
* frames.
*
* For codecs that do not have this property set, PTS and DTS should always be
* equal.
*/
#define AV_CODEC_PROP_REORDER (1 << 3)
/**
/**
* @ingroup lavc_decoding
* @ingroup lavc_decoding
...
...
libavcodec/codec_desc.c
View file @
c5fca017
...
@@ -30,14 +30,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -30,14 +30,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"mpeg1video"
,
.
name
=
"mpeg1video"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1 video"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1 video"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_MPEG2VIDEO
,
.
id
=
AV_CODEC_ID_MPEG2VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"mpeg2video"
,
.
name
=
"mpeg2video"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1 video"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-1 video"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
#if FF_API_XVMC
#if FF_API_XVMC
{
{
...
@@ -60,7 +60,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -60,7 +60,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"h263"
,
.
name
=
"h263"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_RV10
,
.
id
=
AV_CODEC_ID_RV10
,
...
@@ -74,7 +74,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -74,7 +74,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"rv20"
,
.
name
=
"rv20"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"RealVideo 1.0"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"RealVideo 1.0"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_MJPEG
,
.
id
=
AV_CODEC_ID_MJPEG
,
...
@@ -95,7 +95,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -95,7 +95,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"mpeg4"
,
.
name
=
"mpeg4"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-4 part 2"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-4 part 2"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_RAWVIDEO
,
.
id
=
AV_CODEC_ID_RAWVIDEO
,
...
@@ -144,14 +144,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -144,14 +144,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"h263p"
,
.
name
=
"h263p"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.263+ / H.263-1998 / H.263 version 2"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.263+ / H.263-1998 / H.263 version 2"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_H263I
,
.
id
=
AV_CODEC_ID_H263I
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"h263i"
,
.
name
=
"h263i"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Intel H.263"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Intel H.263"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_FLV1
,
.
id
=
AV_CODEC_ID_FLV1
,
...
@@ -172,7 +172,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -172,7 +172,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"svq3"
,
.
name
=
"svq3"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_DVVIDEO
,
.
id
=
AV_CODEC_ID_DVVIDEO
,
...
@@ -200,7 +200,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -200,7 +200,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"h264"
,
.
name
=
"h264"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"
),
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_LOSSLESS
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_LOSSLESS
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_INDEO3
,
.
id
=
AV_CODEC_ID_INDEO3
,
...
@@ -445,28 +445,28 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -445,28 +445,28 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"rv30"
,
.
name
=
"rv30"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"RealVideo 3.0"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"RealVideo 3.0"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_RV40
,
.
id
=
AV_CODEC_ID_RV40
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"rv40"
,
.
name
=
"rv40"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"RealVideo 4.0"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"RealVideo 4.0"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_VC1
,
.
id
=
AV_CODEC_ID_VC1
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"vc1"
,
.
name
=
"vc1"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SMPTE VC-1"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"SMPTE VC-1"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_WMV3
,
.
id
=
AV_CODEC_ID_WMV3
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"wmv3"
,
.
name
=
"wmv3"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Windows Media Video 9"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Windows Media Video 9"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_LOCO
,
.
id
=
AV_CODEC_ID_LOCO
,
...
@@ -578,7 +578,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -578,7 +578,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"cavs"
,
.
name
=
"cavs"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_JPEG2000
,
.
id
=
AV_CODEC_ID_JPEG2000
,
...
@@ -726,7 +726,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -726,7 +726,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"dirac"
,
.
name
=
"dirac"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Dirac"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Dirac"
),
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_LOSSLESS
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_LOSSLESS
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_BFI
,
.
id
=
AV_CODEC_ID_BFI
,
...
@@ -1097,7 +1097,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -1097,7 +1097,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"hevc"
,
.
name
=
"hevc"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"HEVC (High Efficiency Video Coding)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"HEVC (High Efficiency Video Coding)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
|
AV_CODEC_PROP_REORDER
,
},
},
{
{
.
id
=
AV_CODEC_ID_FIC
,
.
id
=
AV_CODEC_ID_FIC
,
...
...
libavcodec/version.h
View file @
c5fca017
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
#include "libavutil/version.h"
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 5
6
#define LIBAVCODEC_VERSION_MINOR 5
7
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
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